diff --git a/awx/main/credential_plugins/aim.py b/awx/main/credential_plugins/aim.py
index 98fb1e55ca..74802e2f1c 100644
--- a/awx/main/credential_plugins/aim.py
+++ b/awx/main/credential_plugins/aim.py
@@ -26,18 +26,19 @@ aim_inputs = {
         'type': 'string',
         'secret': True,
         'multiline': True,
+        'format': 'ssh_private_key',
     }, {
         'id': 'client_cert',
-        'label': _('Client Cert'),
+        'label': _('Client Certificate'),
         'type': 'string',
         'secret': True,
         'multiline': True,
+        'format': 'ssh_private_key',
     }, {
         'id': 'verify',
         'type': 'boolean',
         'default': True,
-        'label': _('Verify'),
-        'help_text': _('Verify SSL certificates for HTTPS requests'),
+        'label': _('Verify SSL Certificates'),
     }],
     'metadata': [{
         'id': 'safe',
diff --git a/awx/ui/client/lib/components/components.strings.js b/awx/ui/client/lib/components/components.strings.js
index 4f506bc480..e91a3ec5b2 100644
--- a/awx/ui/client/lib/components/components.strings.js
+++ b/awx/ui/client/lib/components/components.strings.js
@@ -40,7 +40,7 @@ function ComponentsStrings (BaseString) {
     };
 
     ns.textarea = {
-        SSH_KEY_HINT: t.s('HINT: Drag and drop an SSH private key file on the field below.')
+        SSH_KEY_HINT: t.s('HINT: Drag and drop private file on the field below.')
     };
 
     ns.lookup = {
diff --git a/awx/ui/client/lib/components/input/group.directive.js b/awx/ui/client/lib/components/input/group.directive.js
index 3e62023255..2c589d9266 100644
--- a/awx/ui/client/lib/components/input/group.directive.js
+++ b/awx/ui/client/lib/components/input/group.directive.js
@@ -99,6 +99,7 @@ function AtInputGroupController ($scope, $compile) {
 
                 if (input.secret) {
                     config._component = 'at-input-textarea-secret';
+                    input.format = 'ssh_private_key';
                 } else {
                     config._component = 'at-input-textarea';
                 }
diff --git a/awx/ui/client/lib/components/input/textarea-secret.partial.html b/awx/ui/client/lib/components/input/textarea-secret.partial.html
index 0e4aebe44e..988452ec2b 100644
--- a/awx/ui/client/lib/components/input/textarea-secret.partial.html
+++ b/awx/ui/client/lib/components/input/textarea-secret.partial.html
@@ -1,7 +1,7 @@
 <div class="col-sm-{{::col}} at-InputContainer">
     <div class="form-group at-u-flat">
         <at-input-label></at-input-label>
-        <div ng-class="{ 'input-group': state.tagMode }">
+        <div class="input-group">
             <div class="input-group-btn at-InputGroup-button input-group-prepend" ng-show="state.tagMode">
                 <button
                   class="btn at-ButtonHollow--white at-Input-button--long-sm"