diff --git a/awx/ui/client/src/controllers/Users.js b/awx/ui/client/src/controllers/Users.js
index e53f214e0f..cf7f63b9a1 100644
--- a/awx/ui/client/src/controllers/Users.js
+++ b/awx/ui/client/src/controllers/Users.js
@@ -114,7 +114,7 @@ UsersList.$inject = ['$scope', '$rootScope', '$stateParams',
 
 export function UsersAdd($scope, $rootScope, $stateParams, UserForm,
     GenerateForm, Rest, Alert, ProcessErrors, ReturnToCaller, ClearScope,
-    GetBasePath, ResetForm, Wait, CreateSelect2, $state, $location) {
+    GetBasePath, ResetForm, Wait, CreateSelect2, $state, $location, i18n) {
 
     ClearScope();
 
diff --git a/awx/ui/client/src/helpers/Credentials.js b/awx/ui/client/src/helpers/Credentials.js
index fb7477d61f..a58c37bce8 100644
--- a/awx/ui/client/src/helpers/Credentials.js
+++ b/awx/ui/client/src/helpers/Credentials.js
@@ -223,8 +223,8 @@ angular.module('CredentialsHelper', ['Utilities'])
 }
 ])
 
-.factory('FormSave', ['$rootScope', '$location', 'Alert', 'Rest', 'ProcessErrors', 'Empty', 'GetBasePath', 'CredentialForm', 'ReturnToCaller', 'Wait', '$state',
-         function ($rootScope, $location, Alert, Rest, ProcessErrors, Empty, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state) {
+.factory('FormSave', ['$rootScope', '$location', 'Alert', 'Rest', 'ProcessErrors', 'Empty', 'GetBasePath', 'CredentialForm', 'ReturnToCaller', 'Wait', '$state', 'i18n',
+         function ($rootScope, $location, Alert, Rest, ProcessErrors, Empty, GetBasePath, CredentialForm, ReturnToCaller, Wait, $state, i18n) {
              return function (params) {
                  var scope = params.scope,
                  mode = params.mode,
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 3c931b64d2..7771db2922 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1186,9 +1186,9 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-minmax-error\" ng-show=\"" + this.form.name + '_form.' + fld + ".$error.min || " +
                                 this.form.name + '_form.' + fld + ".$error.max\">";
                             if (field.max !== undefined) {
-                                html += i18n.sprintf(i18n._("Please enter a number greater than %d and less than %d."), field.min, field.max)
+                                html += i18n.sprintf(i18n._("Please enter a number greater than %d and less than %d."), field.min, field.max);
                             } else {
-                                html += i18n.sprintf(i18n._("Please enter a number greater than %d.", field.min)
+                                html += i18n.sprintf(i18n._("Please enter a number greater than %d."), field.min);
                             }
                             html += "</div>\n";
                         }
@@ -1295,7 +1295,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         if (field.required || field.awRequiredWhen) {
                             html += "<div class=\"error\" id=\"" + this.form.name + "-" + fld + "-required-error\" ng-show=\"" +
                                 this.form.name + '_form.' + fld + ".$dirty && " +
-                                this.form.name + '_form.' + fld + ".$error.required\">" + i18n._("Please select a value.)" + "</div>\n";
+                                this.form.name + '_form.' + fld + ".$error.required\">" + i18n._("Please select a value.") + "</div>\n";
                         }
                         html += "<div class=\"error api-error\" id=\"" + this.form.name + "-" + fld + "-api-error\" ng-bind=\"" +
                             fld + "_api_error\"></div>\n";
diff --git a/awx/ui/po/ansible-tower-ui.pot b/awx/ui/po/ansible-tower-ui.pot
index 62433d3bc7..e3226dc3f4 100644
--- a/awx/ui/po/ansible-tower-ui.pot
+++ b/awx/ui/po/ansible-tower-ui.pot
@@ -120,6 +120,7 @@ msgstr ""
 
 #: client/src/forms/JobTemplates.js:459
 #: client/src/forms/Workflows.js:171
+#: client/src/shared/form-generator.js:1703
 msgid "Add Survey"
 msgstr ""
 
@@ -147,6 +148,10 @@ msgstr ""
 msgid "Add user to team"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1450
+msgid "Admin"
+msgstr ""
+
 #: client/src/dashboard/graphs/dashboard-graphs.partial.html:37
 #: client/src/dashboard/graphs/dashboard-graphs.partial.html:43
 #: client/src/dashboard/graphs/dashboard-graphs.partial.html:65
@@ -194,6 +199,10 @@ msgstr ""
 msgid "Ask at runtime?"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1452
+msgid "Auditor"
+msgstr ""
+
 #: client/src/forms/Credentials.js:73
 msgid "Authentication for network device access. This can include SSH keys, usernames, passwords, and authorize information. Network credentials are used when submitting jobs to run playbooks against network devices."
 msgstr ""
@@ -256,6 +265,10 @@ msgstr ""
 msgid "Call to get project failed. GET status:"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1691
+msgid "Cancel"
+msgstr ""
+
 #: client/src/controllers/Projects.js:196
 msgid "Cancel Not Allowed"
 msgstr ""
@@ -268,6 +281,10 @@ msgstr ""
 msgid "Canceled. Click for details"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1084
+msgid "Choose a %s"
+msgstr ""
+
 #: client/src/license/license.partial.html:97
 msgid "Choose your license file, agree to the End User License Agreement, and click submit."
 msgstr ""
@@ -300,6 +317,10 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1695
+msgid "Close"
+msgstr ""
+
 #: client/src/forms/JobTemplates.js:164
 #: client/src/forms/JobTemplates.js:176
 msgid "Cloud Credential"
@@ -525,6 +546,7 @@ msgid "Destination SMS Number"
 msgstr ""
 
 #: client/src/license/license.partial.html:5
+#: client/src/shared/form-generator.js:1481
 msgid "Details"
 msgstr ""
 
@@ -563,6 +585,7 @@ msgstr ""
 
 #: client/src/forms/JobTemplates.js:466
 #: client/src/forms/Workflows.js:178
+#: client/src/shared/form-generator.js:1707
 msgid "Edit Survey"
 msgstr ""
 
@@ -990,6 +1013,7 @@ msgstr ""
 
 #: client/src/lists/PortalJobTemplates.js:39
 #: client/src/lists/Templates.js:83
+#: client/src/shared/form-generator.js:1699
 msgid "Launch"
 msgstr ""
 
@@ -1037,6 +1061,10 @@ msgstr ""
 msgid "Live events: error connecting to the Tower server."
 msgstr ""
 
+#: client/src/shared/form-generator.js:1962
+msgid "Loading..."
+msgstr ""
+
 #: client/src/main-menu/main-menu.partial.html:188
 msgid "Log Out"
 msgstr ""
@@ -1240,6 +1268,14 @@ msgstr ""
 msgid "Number associated with the \"Messaging Service\" in Twilio."
 msgstr ""
 
+#: client/src/shared/form-generator.js:547
+msgid "OFF"
+msgstr ""
+
+#: client/src/shared/form-generator.js:545
+msgid "ON"
+msgstr ""
+
 #: client/src/organizations/list/organizations-list.partial.html:6
 msgid "ORGANIZATIONS"
 msgstr ""
@@ -1301,6 +1337,7 @@ msgid "PASSWORD"
 msgstr ""
 
 #: client/src/organizations/list/organizations-list.partial.html:44
+#: client/src/shared/form-generator.js:1865
 #: client/src/shared/list-generator/list-generator.factory.js:245
 msgid "PLEASE ADD ITEMS TO THIS LIST"
 msgstr ""
@@ -1404,6 +1441,23 @@ msgstr ""
 msgid "Please click the button below to visit Ansible's website to get a Tower license key."
 msgstr ""
 
+#: client/src/shared/form-generator.js:828
+#: client/src/shared/form-generator.js:953
+msgid "Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1189
+msgid "Please enter a number greater than %d and less than %d."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1191
+msgid "Please enter a number greater than %d."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1183
+msgid "Please enter a number."
+msgstr ""
+
 #: client/src/login/loginModal/loginModal.partial.html:78
 msgid "Please enter a password."
 msgstr ""
@@ -1412,6 +1466,17 @@ msgstr ""
 msgid "Please enter a username."
 msgstr ""
 
+#: client/src/shared/form-generator.js:818
+#: client/src/shared/form-generator.js:943
+msgid "Please enter a valid email address."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1044
+#: client/src/shared/form-generator.js:813
+#: client/src/shared/form-generator.js:938
+msgid "Please enter a value."
+msgstr ""
+
 #: client/src/lists/CompletedJobs.js:13
 msgid "Please save and run a job to view"
 msgstr ""
@@ -1455,6 +1520,21 @@ msgstr ""
 msgid "Please select a Machine Credential or check the Prompt on launch option."
 msgstr ""
 
+#: client/src/shared/form-generator.js:1224
+msgid "Please select a number between"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1220
+msgid "Please select a number."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1111
+#: client/src/shared/form-generator.js:1180
+#: client/src/shared/form-generator.js:1298
+#: client/src/shared/form-generator.js:1403
+msgid "Please select a value."
+msgstr ""
+
 #: client/src/forms/JobTemplates.js:83
 msgid "Please select an Inventory or check the Prompt on launch option."
 msgstr ""
@@ -1463,6 +1543,10 @@ msgstr ""
 msgid "Please select an Inventory."
 msgstr ""
 
+#: client/src/shared/form-generator.js:1217
+msgid "Please select at least one value."
+msgstr ""
+
 #: client/src/notifications/shared/type-change.service.js:27
 msgid "Port"
 msgstr ""
@@ -1710,6 +1794,10 @@ msgstr ""
 msgid "Satellite 6 Host"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1687
+msgid "Save"
+msgstr ""
+
 #: client/src/license/license.partial.html:122
 msgid "Save successful!"
 msgstr ""
@@ -1801,6 +1889,10 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
+#: client/src/shared/form-generator.js:843
+msgid "Show"
+msgstr ""
+
 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:34
 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:45
 #: client/src/login/loginModal/thirdPartySignOn/thirdPartySignOn.service.js:56
@@ -1953,6 +2045,10 @@ msgstr ""
 msgid "Test notification"
 msgstr ""
 
+#: client/src/shared/form-generator.js:1409
+msgid "That value was not found.  Please enter or select a valid value."
+msgstr ""
+
 #: client/src/helpers/Credentials.js:105
 msgid "The Project ID is the GCE assigned identification. It is constructed as two words followed by a three digit number.  Such as:"
 msgstr ""
@@ -2013,6 +2109,11 @@ msgstr ""
 msgid "This user is not a member of any teams"
 msgstr ""
 
+#: client/src/shared/form-generator.js:823
+#: client/src/shared/form-generator.js:948
+msgid "This value does not match the password you entered previously.  Please confirm that password."
+msgstr ""
+
 #: client/src/dashboard/lists/jobs/jobs-list.partial.html:14
 msgid "Time"
 msgstr ""
@@ -2029,6 +2130,10 @@ msgstr ""
 msgid "To learn more about the IAM STS Token, refer to the %sAmazon documentation%s."
 msgstr ""
 
+#: client/src/shared/form-generator.js:848
+msgid "Toggle the display of plaintext."
+msgstr ""
+
 #: client/src/notifications/shared/type-change.service.js:34
 #: client/src/notifications/shared/type-change.service.js:40
 msgid "Token"
@@ -2202,6 +2307,7 @@ msgstr ""
 
 #: client/src/forms/JobTemplates.js:450
 #: client/src/forms/Workflows.js:162
+#: client/src/shared/form-generator.js:1711
 msgid "View Survey"
 msgstr ""
 
@@ -2271,6 +2377,7 @@ msgid "When this template is submitted as a job, setting the type to %s will exe
 msgstr ""
 
 #: client/src/forms/Workflows.js:186
+#: client/src/shared/form-generator.js:1715
 msgid "Workflow Editor"
 msgstr ""
 
@@ -2290,6 +2397,26 @@ msgstr ""
 msgid "You do not have permission to add a user."
 msgstr ""
 
+#: client/src/shared/form-generator.js:960
+msgid "Your password must be %d characters long."
+msgstr ""
+
+#: client/src/shared/form-generator.js:965
+msgid "Your password must contain a lowercase letter."
+msgstr ""
+
+#: client/src/shared/form-generator.js:975
+msgid "Your password must contain a number."
+msgstr ""
+
+#: client/src/shared/form-generator.js:970
+msgid "Your password must contain an uppercase letter."
+msgstr ""
+
+#: client/src/shared/form-generator.js:980
+msgid "Your password must contain one of the following characters: %s"
+msgstr ""
+
 #: client/src/controllers/Projects.js:176
 msgid "Your request to cancel the update was submitted to the task manager."
 msgstr ""
@@ -2298,6 +2425,10 @@ msgstr ""
 msgid "Your session timed out due to inactivity. Please sign in."
 msgstr ""
 
+#: client/src/shared/form-generator.js:1224
+msgid "and"
+msgstr ""
+
 #: client/src/forms/Credentials.js:139
 #: client/src/forms/Credentials.js:362
 msgid "set in helpers/credentials"