diff --git a/awx/ui/client/features/credentials/edit-credentials.controller.js b/awx/ui/client/features/credentials/edit-credentials.controller.js
index f39f3abd526c..cbe1d9cb3ba1 100644
--- a/awx/ui/client/features/credentials/edit-credentials.controller.js
+++ b/awx/ui/client/features/credentials/edit-credentials.controller.js
@@ -23,7 +23,7 @@ function EditCredentialsController (models, $state, $scope, strings, componentsS
     };
 
     $scope.$watch('$state.current.name', (value) => {
-        if (/credentials.edit($|\.organization$)/.test(value)) {
+        if (/credentials.edit($|\.organization$|\.credentialType$)/.test(value)) {
             vm.tab.details._active = true;
             vm.tab.permissions._active = false;
         } else {
diff --git a/awx/ui/client/lib/components/input/secret.directive.js b/awx/ui/client/lib/components/input/secret.directive.js
index 542103eba3f9..01b16d412b99 100644
--- a/awx/ui/client/lib/components/input/secret.directive.js
+++ b/awx/ui/client/lib/components/input/secret.directive.js
@@ -37,6 +37,12 @@ function AtInputSecretController (baseInputController) {
         vm.check();
     };
 
+    vm.toggleRevertReplace = () => {
+        scope.state._isBeingReplaced = !scope.state._isBeingReplaced;
+
+        vm.onRevertReplaceToggle();
+    };
+
     vm.toggleShowHide = () => {
         if (scope.type === 'password') {
             scope.type = 'text';