diff --git a/awx/ui/client/src/login/authenticationServices/authentication.service.js b/awx/ui/client/src/login/authenticationServices/authentication.service.js
index 4846646d58..f85a36efe3 100644
--- a/awx/ui/client/src/login/authenticationServices/authentication.service.js
+++ b/awx/ui/client/src/login/authenticationServices/authentication.service.js
@@ -101,7 +101,7 @@ export default
                 $rootScope.current_user = {};
                 $rootScope.license_tested = undefined;
                 $rootScope.userLoggedIn = false;
-                $rootScope.sessionExpired = false;
+                // $rootScope.sessionExpired = false;
                 $rootScope.licenseMissing = true;
                 $rootScope.token = null;
                 $rootScope.token_expires = null;
diff --git a/awx/ui/client/src/login/authenticationServices/timer.factory.js b/awx/ui/client/src/login/authenticationServices/timer.factory.js
index dce6520023..0a4163f492 100644
--- a/awx/ui/client/src/login/authenticationServices/timer.factory.js
+++ b/awx/ui/client/src/login/authenticationServices/timer.factory.js
@@ -23,9 +23,9 @@
  */
 export default
     ['$rootScope', '$cookieStore', 'CreateDialog', 'Authorization',
-        'Store', '$interval', '$location', '$q',
+        'Store', '$interval', '$state', '$q',
     function ($rootScope, $cookieStore, CreateDialog, Authorization,
-        Store, $interval, $location, $q) {
+        Store, $interval, $state, $q) {
         return {
 
             sessionTime: null,
@@ -157,13 +157,13 @@ export default
                             $('#idle-modal').dialog('close');
                         }
                         that.expireSession('idle');
-                        $location.url('/login');
+                        $state.go('signOut');
                     }
                     if(Store('sessionTime') &&
                         Store('sessionTime')[$rootScope.current_user.id] &&
                         Store('sessionTime')[$rootScope.current_user.id].loggedIn === false){
                             that.expireSession();
-                            $location.url('/login');
+                            $state.go('signOut');
 
                     }
 
diff --git a/awx/ui/client/src/login/logout.route.js b/awx/ui/client/src/login/logout.route.js
index 00e13f3155..72b64b6f4a 100644
--- a/awx/ui/client/src/login/logout.route.js
+++ b/awx/ui/client/src/login/logout.route.js
@@ -9,9 +9,9 @@
 export default {
     name: 'signOut',
     route: '/logout',
-    controller: ['Authorization', '$location', function(Authorization, $location) {
+    controller: ['Authorization', '$state', function(Authorization, $state) {
         Authorization.logout();
-        $location.path('/login');
+        $state.go('signIn');
     }],
     ncyBreadcrumb: {
         skip: true
diff --git a/awx/ui/client/src/shared/config/config.service.js b/awx/ui/client/src/shared/config/config.service.js
index 3e405983e8..13ca1ebb8a 100644
--- a/awx/ui/client/src/shared/config/config.service.js
+++ b/awx/ui/client/src/shared/config/config.service.js
@@ -20,7 +20,7 @@ export default
             delete: function(){
                 delete(this.config);
             },
-            
+
             getConfig: function () {
                 var config = this.get(),
                 that = this,