diff --git a/addon/mixins/application-route.coffee b/addon/mixins/application-route.coffee
index 9df60b7..d3b10bc 100644
--- a/addon/mixins/application-route.coffee
+++ b/addon/mixins/application-route.coffee
@@ -30,14 +30,14 @@ export default Ember.Mixin.create ApplicationRouteMixin,
   _loadCurrentUser: (transition) ->
     #if userId = @get('session.data.authenticated.user_id')
     if transition?.targetName is 'login' # don't load current user on login page
-      @get('initial_resources_reject')('Please login')
+      @get('initial_resources_resolve')()
       return
     @get('store').queryRecord('user', me: true).then (user) =>
       @set 'router.globals.current_user', user
       @current_user_loaded user # overloadable
     , =>
       @set 'router.globals.current_user', null
-      @get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation
+      @get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation (login page)
       @transitionTo('login')
 
   actions: