diff --git a/awx/ui/static/js/shared/directives.js b/awx/ui/static/js/shared/directives.js
index 5f1321457c..6401f6517c 100644
--- a/awx/ui/static/js/shared/directives.js
+++ b/awx/ui/static/js/shared/directives.js
@@ -89,7 +89,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
                             ctrl.$setValidity('hasNumber', validity);
                         }
                         if ($AnsibleConfig.password_hasSymbol) {
-                            validity = (/[$-/:-?{-~!"^_`\[\]]/.test(ctrl.$modelValue));
+                            validity = (/[\\#@$-/:-?{-~!"^_`\[\]]/.test(ctrl.$modelValue));
                             ctrl.$setValidity('hasSymbol', validity);
                         }
                     } else {
diff --git a/awx/ui/static/js/shared/form-generator.js b/awx/ui/static/js/shared/form-generator.js
index e8194cff8d..d7e97a7f63 100644
--- a/awx/ui/static/js/shared/form-generator.js
+++ b/awx/ui/static/js/shared/form-generator.js
@@ -1003,7 +1003,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             }
                             if ($AnsibleConfig.password_hasSymbol) {
                                 html += "<div class=\"error\" ng-show=\"" + this.form.name + '_form.' + fld +
-                                    ".$error.hasSymbol\">Your password must contain one of the following characters: -!$%^&*()_+|~=`{}\[\]:\";\'<>?,.\/.</div>\n";
+                                    ".$error.hasSymbol\">Your password must contain one of the following characters: `~!@#$%^&*()_-+=|}\]{\[;:\"\'?\/>.<,\n";
                             }
                         }