diff --git a/awx/ui/client/src/configuration/forms/system-form/configuration-system.controller.js b/awx/ui/client/src/configuration/forms/system-form/configuration-system.controller.js
index 63fed820d2..520a0d5516 100644
--- a/awx/ui/client/src/configuration/forms/system-form/configuration-system.controller.js
+++ b/awx/ui/client/src/configuration/forms/system-form/configuration-system.controller.js
@@ -205,18 +205,25 @@ export default [
 
         $scope.$parent.vm.testLogging = function () {
             if (!$scope.$parent.vm.disableTestButton) {
+                $scope.$parent.vm.disableTestButton = true;
                 Rest.setUrl("/api/v2/settings/logging/test/");
                 Rest.post({})
                     .then(() => {
+                        $scope.$parent.vm.disableTestButton = false;
                         ngToast.success({
+                            dismissButton: false,
+                            dismissOnTimeout: true,
                             content: `<i class="fa fa-check-circle
                                 Toast-successIcon"></i>` +
                                 i18n._('Log aggregator test sent successfully.')
                         });
                     })
                     .catch(({ data, status }) => {
+                        $scope.$parent.vm.disableTestButton = false;
                         if (status === 400 || status == 500) {
                             ngToast.danger({
+                                dismissButton: false,
+                                dismissOnTimeout: true,
                                 content: '<i class="fa fa-exclamation-triangle Toast-successIcon"></i>' +
                                     i18n._('Log aggregator test failed. <br> Detail: ') + $filter('sanitize')(data.error),
                                 additionalClasses: "LogAggregator-failedNotification"