diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js
new file mode 100644
index 0000000..7c58420
--- /dev/null
+++ b/app/initializers/custom-session.js
@@ -0,0 +1,24 @@
+import Session from 'simple-auth/session';
+import parseBase64 from '../utils/parse-base64';
+
+var CustomSession = Session.extend({
+  currentUser: function() {
+    let token = this.get('secure.token');
+    if (!Ember.isEmpty(token)) {
+      let t = parseBase64(token);
+      return this.container.lookup('store:main').find('user', t['sub']);
+    }
+    return null;
+  }.property('secure.token'),
+
+});
+
+export function initialize(container, application) {
+  application.register('session:custom', CustomSession);
+}
+
+export default {
+  name: 'custom-session',
+  before: 'simple-auth',
+  initialize: initialize
+};
diff --git a/app/pods/application/route.js b/app/pods/application/route.js
index e3173ee..38000bd 100644
--- a/app/pods/application/route.js
+++ b/app/pods/application/route.js
@@ -1,7 +1,17 @@
 import Ember from 'ember';
 import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin';
+// import parseBase64 from '../../utils/parse-base64';
 
 export default Ember.Route.extend(ApplicationRouteMixin, {
+  // model: function() {
+  //   let token = this.get('session.secure.token');
+  //   if (Ember.isNone(token)) {
+  //     return null;
+  //   }
+  //   let user = parseBase64(token);
+  //   return this.store.find('user', user.sub);
+  // },
+
   actions: {
     invalidateSession: function() {
       this.get('session').invalidate().then(() => {
diff --git a/app/pods/index/route.js b/app/pods/index/route.js
index d38ae27..2c4d6db 100644
--- a/app/pods/index/route.js
+++ b/app/pods/index/route.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
-  beforeModel: function() {
+  beforeModel: function(transition) {
+    this._super(transition);
     this.transitionTo('compare');
   }
 });
diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index c622ec8..fd1b966 100644
--- a/app/pods/login/controller.js
+++ b/app/pods/login/controller.js
@@ -11,13 +11,7 @@ export default Ember.Controller.extend({
       this.set('loading', true);
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      session.authenticate(authenticator, credentials).then(()=>{
-        this.set('loading', false);
-        let t = parseBase64(session.get('secure.token'));
-        this.store.find('user', t['sub']).then((user) => {
-          session.set('currentUser', user);
-        });
-      }, (error)=> {
+      session.authenticate(authenticator, credentials).then(null, (error)=> {
         this.set('loading', false);
         this.get('flashMessages').error(error.error);
       });
diff --git a/app/pods/species/new/route.js b/app/pods/species/new/route.js
index 0cdcf55..37be440 100644
--- a/app/pods/species/new/route.js
+++ b/app/pods/species/new/route.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
-  beforeModel: function() {
+  beforeModel: function(transition) {
+    this._super(transition);
     if (this.get('session.currentUser.role') === 'R') {
       this.transitionTo('species.index');
     }
diff --git a/app/pods/strains/new/route.js b/app/pods/strains/new/route.js
index e2bdecb..d214671 100644
--- a/app/pods/strains/new/route.js
+++ b/app/pods/strains/new/route.js
@@ -2,7 +2,8 @@ import Ember from 'ember';
 import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
-  beforeModel: function() {
+  beforeModel: function(transition) {
+    this._super(transition);
     if (this.get('session.currentUser.role') === 'R') {
       this.transitionTo('strains.index');
     }
diff --git a/config/environment.js b/config/environment.js
index 847fa80..97172f8 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -16,6 +16,7 @@ module.exports = function(environment) {
     },
     podModulePrefix: 'hymenobacterdotinfo/pods',
     'simple-auth': {
+      session: 'session:custom',
       authorizer: 'simple-auth-authorizer:token',
       store: 'simple-auth-session-store:local-storage',
     },