diff --git a/src/coffee/controllers/header_controller.coffee b/src/coffee/controllers/header_controller.coffee
index 35bbe8b19..78d74edfe 100644
--- a/src/coffee/controllers/header_controller.coffee
+++ b/src/coffee/controllers/header_controller.coffee
@@ -21,10 +21,12 @@ module.exports = class HeaderController extends BaseController
     constructor: (options={})->
         if not options.client? then throw new Error 'options.client is required'
         if not options.modPack? then throw new Error 'options.modPack is required'
+        if not options.storage? then throw new Error 'options.storage is required'
         super options
 
         @client  = options.client
         @modPack = options.modPack
+        @storage = options.storage
         @_user   = options.user
 
     # Event Methods ################################################################################
@@ -34,7 +36,8 @@ module.exports = class HeaderController extends BaseController
 
         if @user?
             @client.logout()
-                .then ->
+                .then =>
+                    @storage.store 'loginSecurityToken', null
                     router.user = null
                 .catch (error)->
                     logger.error -> "Failed to log out: #{error}"
diff --git a/src/coffee/controllers/login_page_controller.coffee b/src/coffee/controllers/login_page_controller.coffee
index 0bfaaa71a..1d426b3ed 100644
--- a/src/coffee/controllers/login_page_controller.coffee
+++ b/src/coffee/controllers/login_page_controller.coffee
@@ -71,7 +71,7 @@ module.exports = class LoginPageController extends PageController
         @$readMoreLink    = @$('a.read-more')
         @$readMoreContent = @$('.read-more-content')
 
-        if (not @user?) and (@params?.state is @loginSecurityToken)
+        if (not @user?) and (@params?.state?) and (@params?.state is @loginSecurityToken)
             @client.completeGitHubLogin code:@params.code
                 .then (response)=>
                     attributes = response.json.data.user