diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index e1ea7188dd..a7a82495e4 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -317,15 +317,21 @@ export default [
                     "class": "btn Form-cancelButton",
                     "id": "formmodal-cancel-button",
                     onClick: function() {
+                        clearApiErrors();
+                        populateFromApi();
+                        $scope[formTracker.currentFormName()].$setPristine();
                         $('#FormModal-dialog').dialog('close');
-                        $state.go('setup');
                     }
                 }, {
                     label: i18n._("Save changes"),
                     onClick: function() {
-                        $scope.formSave();
-                        $('#FormModal-dialog').dialog('close');
-                        $state.go('setup');
+                        vm.formSave().then(() => {
+                            $scope[formTracker.currentFormName()].$setPristine();
+                            $('#FormModal-dialog').dialog('close');
+                        }).catch(()=> {
+                            event.preventDefault();
+                            $('#FormModal-dialog').dialog('close');
+                        });
                     },
                     "class": "btn btn-primary",
                     "id": "formmodal-save-button"