diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 1563213718..d5486e61e7 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -236,7 +236,7 @@ function ProjectsAdd ($scope, $rootScope, $compile, $location, $log, $routeParam
    scope.scmChange = function() {
        // When an scm_type is set, path is not required
        scope.pathRequired = (scope.scm_type) ? false : true;
-       scope.scmBranchLabel = (scope.scm_type.value == 'svn') ? 'Revision #' : 'SCM Branch'; 
+       scope.scmBranchLabel = (scope.scm_type && scope.scm_type.value && scope.scm_type.value == 'svn') ? 'Revision #' : 'SCM Branch'; 
        }
 
    scope.authChange = function() {
@@ -504,7 +504,7 @@ function ProjectsEdit ($scope, $rootScope, $compile, $location, $log, $routePara
    scope.scmChange = function() {
        // When an scm_type is set, path is not required
        scope.pathRequired = (scope.scm_type) ? false : true;
-       scope.scmBranchLabel = (scope.scm_type.value == 'svn') ? 'Revision #' : 'SCM Branch'; 
+       scope.scmBranchLabel = (scope.scm_type && scope.scm_type.value && scope.scm_type.value == 'svn') ? 'Revision #' : 'SCM Branch';  
        }
 }
 
diff --git a/awx/ui/static/js/controllers/Users.js b/awx/ui/static/js/controllers/Users.js
index 280ffe2fbe..6f55c8958c 100644
--- a/awx/ui/static/js/controllers/Users.js
+++ b/awx/ui/static/js/controllers/Users.js
@@ -130,7 +130,11 @@ function UsersAdd ($scope, $rootScope, $compile, $location, $log, $routeParams,
                  else {
                     data[fld] = scope[fld];
                  }   
-             } 
+             }
+             
+             data.is_superuser = (data.is_superuser == null || data.is_superuser == undefined || data.is_superuser == '') ? false : 
+                 data.is_superuser;
+
              Rest.post(data)
                  .success( function(data, status, headers, config) {
                      var base = $location.path().replace(/^\//,'').split('/')[0];
@@ -247,8 +251,17 @@ function UsersEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
           Rest.setUrl(defaultUrl + id + '/');
           var data = {}
           for (var fld in form.fields) {
-              data[fld] = scope[fld];   
-          } 
+              if (form.fields[fld].realName) {
+                 data[form.fields[fld].realName] = scope[fld];
+              }
+              else {
+                 data[fld] = scope[fld];
+              }   
+          }
+
+          data.is_superuser = (data.is_superuser == null || data.is_superuser == undefined || data.is_superuser == '') ? false : 
+              data.is_superuser;
+
           Rest.put(data)
               .success( function(data, status, headers, config) {
                   var base = $location.path().replace(/^\//,'').split('/')[0];
diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js
index b882c26319..a0236dab10 100644
--- a/awx/ui/static/js/forms/Users.js
+++ b/awx/ui/static/js/forms/Users.js
@@ -48,7 +48,7 @@ angular.module('UserFormDefinition', [])
                 sourceField: 'name',
                 ngClick: 'lookUpOrganization()',
                 excludeMode: 'edit',
-                awRequiredWhen: { variable: "orgrequired", init: true}
+                awRequiredWhen: { variable: "orgrequired", init: true }
                 },
             username: {
                 label: 'Username',
@@ -65,7 +65,7 @@ angular.module('UserFormDefinition', [])
                 label: 'Password',
                 type: 'password',
                 ngShow: 'ldap_user == false',
-                awRequiredWhen: { variable: "not_ldap_user", init: true},
+                awRequiredWhen: { variable: "not_ldap_user", init: true },
                 ngChange: "clearPWConfirm('password_confirm')",
                 autocomplete: false,
                 chkPass: true