diff --git a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
index 7b7ecf84bb..f3cb9605e6 100644
--- a/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
+++ b/awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
@@ -268,7 +268,7 @@ export default [
 
         $scope.$on('populated', function() {
             startCodeMirrors();
-            populateLDAPGroupType();
+            populateLDAPGroupType(false);
         });
 
         angular.extend(authVm, {
diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index 05b5c2e576..dab604b744 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -449,6 +449,7 @@ export default [
                 .then(function() {
                     populateFromApi();
                     $scope[formTracker.currentFormName()].$setPristine();
+                    $scope.$broadcast('CUSTOM_LOGO_reverted');
                 })
                 .catch(function(error) {
                     ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],
diff --git a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
index 6a177ae0c1..2aca32628b 100644
--- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
+++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.controller.js
@@ -99,8 +99,8 @@ export default [
             populateAdhocCommand(flag);
         });
 
-        $scope.$on('populated', function(e, data, flag) {
-            populateAdhocCommand(flag);
+        $scope.$on('populated', function() {
+            populateAdhocCommand(false);
         });
 
         // Fix for bug where adding selected opts causes form to be $dirty and triggering modal
diff --git a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js
index 10ac4b74ef..17b1f8edfb 100644
--- a/awx/ui/client/src/configuration/system-form/configuration-system.controller.js
+++ b/awx/ui/client/src/configuration/system-form/configuration-system.controller.js
@@ -152,8 +152,8 @@ export default [
 
         var dropdownRendered = false;
 
-        $scope.$on('populated', function(e, data, flag) {
-            populateLogAggregator(flag);
+        $scope.$on('populated', function() {
+            populateLogAggregator(false);
         });
 
         $scope.$on('LOG_AGGREGATOR_TYPE_populated', function(e, data, flag) {
diff --git a/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js b/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js
index e5ee604091..000b265b93 100644
--- a/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js
+++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.controller.js
@@ -101,8 +101,8 @@
              populatePendoTrackingState(flag);
          });
 
-         $scope.$on('populated', function(e, data, flag){
-             populatePendoTrackingState(flag);
+         $scope.$on('populated', function(){
+             populatePendoTrackingState(false);
          });
 
          angular.extend(uiVm, {
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 3f368b0c28..1dcfb7ac62 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -179,7 +179,7 @@ function(ConfigurationUtils, i18n, $rootScope) {
                     scope.$parent[fieldKey] = '';
                     filePickerButton.html(browseText);
                     filePickerText.val('');
-                    filePicker.value = "";
+                    filePicker.context.value = "";
                     scope.imagePresent = false;
                 }
                 else {