diff --git a/awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js b/awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js
index 251e9845f2..d3ef949ca6 100644
--- a/awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js
+++ b/awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js
@@ -199,7 +199,6 @@ export default [
                 name: 'ldap5'
             },
         ];
-
         var forms = _.map(authForms, 'formDef');
         _.each(forms, function(form) {
             var keys = _.keys(form.fields);
@@ -207,9 +206,9 @@ export default [
                 if($scope.configDataResolve[key].type === 'choice') {
                     // Create options for dropdowns
                     var optionsGroup = key + '_options';
-                    $scope.$parent[optionsGroup] = [];
+                    $scope.$parent.$parent[optionsGroup] = [];
                     _.each($scope.configDataResolve[key].choices, function(choice){
-                        $scope.$parent[optionsGroup].push({
+                        $scope.$parent.$parent[optionsGroup].push({
                             name: choice[0],
                             label: choice[1],
                             value: choice[0]
@@ -303,7 +302,7 @@ export default [
             }
 
             if($scope.$parent[groupPropName] !== null) {
-                $scope.$parent[groupPropName] = _.find($scope[groupOptionsPropName], { value: $scope.$parent[groupPropName] });
+                $scope.$parent.$parent[groupPropName] = _.find($scope[groupOptionsPropName], { value: $scope.$parent[groupPropName] });
             }
 
             if(flag !== undefined){
@@ -322,7 +321,7 @@ export default [
 
         function populateTacacsProtocol(flag){
             if($scope.$parent.TACACSPLUS_AUTH_PROTOCOL !== null) {
-                $scope.$parent.TACACSPLUS_AUTH_PROTOCOL = _.find($scope.$parent.TACACSPLUS_AUTH_PROTOCOL_options, { value: $scope.$parent.TACACSPLUS_AUTH_PROTOCOL });
+                $scope.$parent.$parent.TACACSPLUS_AUTH_PROTOCOL = _.find($scope.$parent.TACACSPLUS_AUTH_PROTOCOL_options, { value: $scope.$parent.TACACSPLUS_AUTH_PROTOCOL });
             }
 
             if(flag !== undefined){
diff --git a/awx/ui/client/src/configuration/settings.block.less b/awx/ui/client/src/configuration/settings.block.less
index 8d85b6bcea..84d349039e 100644
--- a/awx/ui/client/src/configuration/settings.block.less
+++ b/awx/ui/client/src/configuration/settings.block.less
@@ -35,7 +35,9 @@
     width: 100%;
     margin: 0 0 22px auto;
     display: flex;
-    justify-content: flex-end;
+    justify-content: flex-start;
+    border-bottom: 1px solid @at-gray-b7;
+    padding-bottom: 22px;
 }
 
 .Form-nav--ldapDropdownContainer {