diff --git a/awx/ui/client/src/controllers/Users.js b/awx/ui/client/src/controllers/Users.js
index 9cd0d2d161..f143d2f2e6 100644
--- a/awx/ui/client/src/controllers/Users.js
+++ b/awx/ui/client/src/controllers/Users.js
@@ -307,6 +307,7 @@ export function UsersEdit($scope, $rootScope, $compile, $location, $log, $routeP
                 $scope.ldap_user = (data.ldap_dn !== null && data.ldap_dn !== undefined && data.ldap_dn !== '') ? true : false;
                 $scope.not_ldap_user = !$scope.ldap_user;
                 master.ldap_user = $scope.ldap_user;
+                $scope.socialAuthUser = (data.auth.length > 0) ? true : false;
 
                 // Initialize related search functions. Doing it here to make sure relatedSets object is populated.
                 RelatedSearchInit({
diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index 1f2ebef3aa..8a5fbce7ce 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -84,7 +84,7 @@ export default
                     label: 'Password',
                     type: 'sensitive',
                     hasShowInputButton: true,
-                    ngShow: 'ldap_user == false',
+                    ngShow: 'ldap_user == false && socialAuthUser === false',
                     addRequired: true,
                     editRequired: false,
                     ngChange: "clearPWConfirm('password_confirm')",
@@ -95,7 +95,7 @@ export default
                     label: 'Confirm Password',
                     type: 'sensitive',
                     hasShowInputButton: true,
-                    ngShow: 'ldap_user == false',
+                    ngShow: 'ldap_user == false && socialAuthUser === false',
                     addRequired: true,
                     editRequired: false,
                     awPassMatch: true,