diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js
index 24070160cb..227c06d06b 100644
--- a/awx/ui/static/js/app.js
+++ b/awx/ui/static/js/app.js
@@ -237,7 +237,7 @@ angular.module('ansible', [
 
         $rootScope.breadcrumbs = new Array(); 
         $rootScope.crumbCache = new Array();
-
+        
         $rootScope.$on("$routeChangeStart", function(event, next, current) {
             // On each navigation request, check that the user is logged in
             if (Authorization.isUserLoggedIn() == false) {
@@ -252,9 +252,9 @@ angular.module('ansible', [
                CheckLicense();
             }
             // Make the correct tab active
-            var base = ($location.path().replace(/^\//,'').split('/')[0]);
-            if  (base == '') {
-                $('.nav-tabs a[href="#' + 'organizations' + '"]').tab('show');
+            var base = $location.path().replace(/^\//,'').split('/')[0];
+            if (base == '') {
+               $('.nav-tabs a[href="#' + 'organizations' + '"]').tab('show');
             }
             else {
                 base.replace(/\_/g,' ');
diff --git a/awx/ui/static/js/controllers/Projects.js b/awx/ui/static/js/controllers/Projects.js
index 29cbf46279..fa45ebd3ba 100644
--- a/awx/ui/static/js/controllers/Projects.js
+++ b/awx/ui/static/js/controllers/Projects.js
@@ -12,11 +12,12 @@
 
 function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest, Alert, ProjectList,
                        GenerateList, LoadBreadCrumbs, Prompt, SearchInit, PaginateInit, ReturnToCaller,
-                       ClearScope, ProcessErrors, GetBasePath, SelectionInit, SCMUpdate, ProjectStatus,
+                       ClearScope, ProcessErrors, GetBasePath, SelectionInit, ProjectUpdate, ProjectStatus,
                        FormatDate)
 {
     ClearScope('htmlTemplate');  //Garbage collection. Don't leave behind any listeners/watchers from the prior
                                  //scope.
+    
     var list = ProjectList;
     var defaultUrl = GetBasePath('projects');
     var view = GenerateList;
@@ -119,13 +120,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
     scope.refresh = function() {
         scope.search(list.iterator); 
         }
-    
-    if (scope.removeUpdateSubmitted) {
-       scope.removeUpdateSubmitted();
-    }
-    scope.removeUpdateSubmitted = scope.$on('UpdateSubmitted', function() {
-        scope.search(list.iterator); 
-        });
+
     scope.SCMUpdate = function(project_id) {
        for (var i=0; i < scope.projects.length; i++) {
            if (scope.projects[i].id == project_id) {
@@ -136,9 +131,8 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
                  Alert('Update in Progress', 'The SCM update process is running. Use the Refresh button to monitor the status.', 'alert-info'); 
               }
               else {
-                 SCMUpdate({ scope: scope, project_id: project_id });
+                 ProjectUpdate({ scope: scope, project_id: project_id });
               }
-              break;
            }
        }
        }
@@ -146,7 +140,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
 
 ProjectsList.$inject = [ '$scope', '$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'ProjectList', 'GenerateList', 
                          'LoadBreadCrumbs', 'Prompt', 'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
-                         'GetBasePath', 'SelectionInit', 'SCMUpdate', 'ProjectStatus', 'FormatDate'];
+                         'GetBasePath', 'SelectionInit', 'ProjectUpdate', 'ProjectStatus', 'FormatDate'];
 
 
 function ProjectsAdd ($scope, $rootScope, $compile, $location, $log, $routeParams, ProjectsForm, 
diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index c6d7f2fb2d..e3adeb26f7 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -5,7 +5,7 @@
  * 
  */
 angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'CredentialFormDefinition', 'CredentialsListDefinition',
-    'LookUpHelper', 'ProjectFormDefinition' ])
+    'LookUpHelper', 'ProjectFormDefinition', 'JobSubmissionHelper'])
 
     .factory('PromptPasswords', ['CredentialForm', 'JobTemplateForm', 'ProjectsForm', '$compile', 'Rest', '$location', 'ProcessErrors', 'GetBasePath',
         'Alert',
@@ -15,7 +15,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
         var scope = params.scope; 
         var passwords = params.passwords;
         var start_url = params.start_url;
-        var form = CredentialForm;
+        var form = params.form;
         var html = '';
         var field, element, dialogScope, fld;
         var base = $location.path().replace(/^\//,'').split('/')[0];
@@ -31,11 +31,12 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                }
             } 
             else {
+               console.log('navigating to: ' +  base);
                $location.path('/' + base);
             }
             }
 
-        function cancelJob() {
+        function cancel() {
             // Delete a job
             var url = GetBasePath('jobs') + scope.job_id +'/'
             Rest.setUrl(url);
@@ -55,7 +56,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
             // User clicked cancel button
             $('#password-modal').modal('hide');
             if (form.name == 'credential') {
-               cancelJob();
+               cancel();
             }
             }
         
@@ -88,7 +89,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                if (form.name == 'credential') {
                   // No passwords provided, so we can't start the job. Rather than leave the job in a 'new'
                   // state, let's delete it. 
-                  scope.cancelJob();
+                  cancelJob();
                }   
             }
             }
@@ -145,10 +146,10 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                html += "</div>\n";
             }
             html += "</form>\n";
-            element = angular.element(document.getElementById('password-body'));
+            var element = angular.element(document.getElementById('password-body'));
             element.html(html);
             $compile(element.contents())(scope);
-            $('#password-modal').modal({ });
+            $('#password-modal').modal();
         }
         else {
             scope.startJob();
@@ -269,24 +270,40 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
     }])
     
     // Sumbit SCM Update request
-    .factory('SCMUpdate',['PromptPasswords', '$compile', 'Rest', '$location', 'GetBasePath', 'ProcessErrors', 'Alert',
+    .factory('ProjectUpdate',['PromptPasswords', '$compile', 'Rest', '$location', 'GetBasePath', 'ProcessErrors', 'Alert',
         'ProjectsForm',
     function(PromptPasswords, $compile, Rest, $location, GetBasePath, ProcessErrors, Alert, ProjectsForm) { 
     return function(params) {
         var scope = params.scope; 
         var project_id = params.project_id;
         var url = GetBasePath('projects') + project_id + '/update/';
+        
+        if (scope.removeUpdateSubmitted) {
+           scope.removeUpdateSubmitted();
+        }
+        scope.removeUpdateSubmitted = scope.$on('UpdateSubmitted', function() {
+            $location.path('/projects');
+            });
+        
+        if (scope.removeSCMSubmit) {
+           scope.removeSCMSubmit();
+        }
+        scope.removeSCMSubmit = scope.$on('SCMSubmit', function(e, passwords_needed_to_update) {
+            // After the call to update, kick off the job.
+            PromptPasswords({
+                       scope: scope,
+                       passwords: passwords_needed_to_update,
+                       start_url: url, 
+                       form: ProjectsForm
+                       });
+            });
+        
         // Check to see if we have permission to perform the update and if any passwords are needed
         Rest.setUrl(url);
         Rest.get()
             .success( function(data, status, headers, config) {
                 if (data.can_update) {
-                   PromptPasswords({
-                       scope: scope,
-                       passwords: data.passwords_needed_to_update,
-                       start_url: url, 
-                       form: ProjectsForm
-                       });
+                   scope.$emit('SCMSubmit', data.passwords_needed_to_update);
                 } 
                 else {
                    Alert('Permission Denied', 'You do not have access to update this project. Please contact your system administrator.', 
@@ -300,26 +317,3 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
             };
     }]);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-