diff --git a/lib/login/addon/login/controller.js b/lib/login/addon/login/controller.js
index b406903cb..2728d5a25 100644
--- a/lib/login/addon/login/controller.js
+++ b/lib/login/addon/login/controller.js
@@ -269,14 +269,13 @@ export default Controller.extend({
       return false;
     }
 
-    const current = `${ window.location.origin }${ window.location.pathname }` ;
+    const current = `${ window.location.origin }${ window.location.pathname }`;
+    const rootUrl = current.substr(0, current.length - 6);
 
     if ( current === redirect || `${ rootUrl }/` === redirect ) {
       return false;
     }
 
-    const rootUrl = current.substr(0, current.length - 6);
-
     if ( redirect.startsWith(rootUrl) && redirect !== rootUrl && redirect !== `${ rootUrl }/` ) {
       return true;
     }