diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 856f68f2e7..800846af35 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -364,7 +364,9 @@ var tower = angular.module('Tower', [
 
                 if (!Authorization.getToken() || !Authorization.isUserLoggedIn()) {
                     // User not authenticated, redirect to login page
-                    $cookies.put('preAuthUrl', $location.path());
+                    if (!/^\/(login|logout)/.test($location.path())) {
+                        $cookies.put('preAuthUrl', $location.path());
+                    }
                     $location.path('/login');
                 } else {
                     var lastUser = $cookies.getObject('current_user'),