diff --git a/src/coffee/controllers/header_controller.coffee b/src/coffee/controllers/header_controller.coffee
index a973eb130..35bbe8b19 100644
--- a/src/coffee/controllers/header_controller.coffee
+++ b/src/coffee/controllers/header_controller.coffee
@@ -40,7 +40,7 @@ module.exports = class HeaderController extends BaseController
                     logger.error -> "Failed to log out: #{error}"
                 .done()
         else
-            router.navigate Url.login(), trigger:true
+            router.login()
 
     onLogoClicked: ->
         router.navigate '/', trigger:true
diff --git a/src/coffee/crafting_guide_router.coffee b/src/coffee/crafting_guide_router.coffee
index cf65c49e6..3ce522a7b 100644
--- a/src/coffee/crafting_guide_router.coffee
+++ b/src/coffee/crafting_guide_router.coffee
@@ -87,7 +87,7 @@ module.exports = class CraftingGuideRouter extends backbone.Router
 
     resumeAfterLogin: ->
         url = @storage.load 'post-login-url'
-        url ?= Url.root()
+        url = if (not url? or url is 'null') then Url.root() else url
         @navigate url, trigger:true
         @storage.store 'post-login-url', null
 
@@ -118,15 +118,41 @@ module.exports = class CraftingGuideRouter extends backbone.Router
         @_recordPageView()
 
     routes:
-        '(/(index.html))':                                        'route__home'
-        'browse(/(index.html))':                                  'route__browse'
-        'browse/:modSlug(/(index.html))':                         'route__browseMod'
-        'browse/:modSlug/:itemSlug(/(index.html))':               'route__browseModItem'
-        'browse/:modSlug/tutorials/:tutorialSlug(/(index.html))': 'route__browseTutorial'
-        'configure(/(index.html))':                               'route__configure'
-        'craft(/(index.html))':                                   'route__craft'
+        '':                                                       'route__home'
+        '/':                                                      'route__home'
+        '/index.html':                                            'route__home'
+
+        'browse':                                                 'route__browse'
+        'browse/':                                                'route__browse'
+        'browse/index.html':                                      'route__browse'
+
+        'browse/:modSlug':                                        'route__browseMod'
+        'browse/:modSlug/':                                       'route__browseMod'
+        'browse/:modSlug/index.html':                             'route__browseMod'
+
+        'browse/:modSlug/:itemSlug':                              'route__browseModItem'
+        'browse/:modSlug/:itemSlug/':                             'route__browseModItem'
+        'browse/:modSlug/:itemSlug/index.html':                   'route__browseModItem'
+
+        'browse/:modSlug/tutorials/:tutorialSlug':                'route__browseTutorial'
+        'browse/:modSlug/tutorials/:tutorialSlug/':               'route__browseTutorial'
+        'browse/:modSlug/tutorials/:tutorialSlug/index.html':     'route__browseTutorial'
+
+        'configure':                                              'route__configure'
+        'configure/':                                             'route__configure'
+        'configure/index.html':                                   'route__configure'
+
+        'craft':                                                  'route__craft'
+        'craft/':                                                 'route__craft'
+        'craft/index.html':                                       'route__craft'
+
         'craft/:text':                                            'route__craft'
-        'login(/(index.html))':                                   'route__login'
+        'craft/:text/':                                           'route__craft'
+        'craft/:text/index.html':                                 'route__craft'
+
+        'login':                                                  'route__login'
+        'login/':                                                 'route__login'
+        'login/index.html':                                       'route__login'
 
         'item/:itemSlug':         'deprecated__item'
         'crafting/(:text)':       'deprecated__crafting'
diff --git a/src/jade/includes/_header.jade b/src/jade/includes/_header.jade
index 8f5b564e5..9c69845e5 100644
--- a/src/jade/includes/_header.jade
+++ b/src/jade/includes/_header.jade
@@ -14,7 +14,7 @@
     .divider.bottom
         .login
             span.name
-            a(href="/login") Login
+            a(href="/login/") Login
 
     .navBar
         a(data-page="home", href="/")
diff --git a/src/jade/templates/login_page.jade b/src/jade/templates/login_page.jade
index addd6bd1e..c96542532 100644
--- a/src/jade/templates/login_page.jade
+++ b/src/jade/templates/login_page.jade
@@ -51,8 +51,9 @@
     .two-thirds-content.hideable.hidden.fetching-token
         img.float-right(src="/images/github-login-large.png")
         h1 Completing log in...
-        p.
-            Hang on just a second while we finish logging you in...
+        p Hang on just a second while we finish logging you in...
+        .actions
+            img(src="/images/wait.gif")
 
         .clear