diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 6e56199957..6763c7f7a2 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -55,7 +55,10 @@
     min-height: 40px;
 }
 
-.Form-title--is_superuser, .Form-title--is_system_auditor, .Form-title--is_ldap_user{
+.Form-title--is_superuser,
+.Form-title--is_system_auditor,
+.Form-title--is_ldap_user,
+.Form-title--is_external_account{
     height:15px;
     color: @default-interface-txt;
     background-color: @default-list-header-bg;
diff --git a/awx/ui/client/src/controllers/Users.js b/awx/ui/client/src/controllers/Users.js
index bf1f86feec..f368f8a61a 100644
--- a/awx/ui/client/src/controllers/Users.js
+++ b/awx/ui/client/src/controllers/Users.js
@@ -162,6 +162,7 @@ export function UsersAdd($scope, $rootScope, $compile, $location, $log,
     $scope.not_ldap_user = !$scope.ldap_user;
     $scope.ldap_dn = null;
     $scope.socialAuthUser = false;
+    $scope.external_account = null;
 
     generator.reset();
 
@@ -334,6 +335,7 @@ export function UsersEdit($scope, $rootScope, $location,
             $scope.not_ldap_user = !$scope.ldap_user;
             master.ldap_user = $scope.ldap_user;
             $scope.socialAuthUser = (data.auth.length > 0) ? true : false;
+            $scope.external_account = data.external_account;
 
             $scope.user_type = $scope.user_type_options[0];
             $scope.is_system_auditor = false;
diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index 6ce19602b4..ddcda6e296 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -46,7 +46,7 @@ export default
                     label: 'Username',
                     type: 'text',
                     awRequiredWhen: {
-                        reqExpression: "not_ldap_user",
+                        reqExpression: "not_ldap_user && external_account === null",
                         init: true
                     },
                     autocomplete: false
@@ -69,7 +69,7 @@ export default
                     label: 'Password',
                     type: 'sensitive',
                     hasShowInputButton: true,
-                    ngShow: 'ldap_user == false && socialAuthUser === false',
+                    ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
                     addRequired: true,
                     editRequired: false,
                     ngChange: "clearPWConfirm('password_confirm')",
@@ -80,7 +80,7 @@ export default
                     label: 'Confirm Password',
                     type: 'sensitive',
                     hasShowInputButton: true,
-                    ngShow: 'ldap_user == false && socialAuthUser === false',
+                    ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
                     addRequired: true,
                     editRequired: false,
                     awPassMatch: true,
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 5417829724..b263362bf2 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1487,6 +1487,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             "ng-show='is_system_auditor'>Auditor</span>";
                         html+= "<span class=\"Form-title--is_ldap_user\" "+
                             "ng-show='ldap_user'>LDAP</span>";
+                        html+= "<span class=\"Form-title--is_external_account\" "+
+                            "ng-show='external_account'>{{external_account}}</span>";
                     }
                     html += "</div>\n";
                     html += "<div class=\"Form-header--fields\">";