diff --git a/app/models/event.js b/app/models/event.js
index 4f137dab5ab..2987efd3bca 100644
--- a/app/models/event.js
+++ b/app/models/event.js
@@ -1,6 +1,5 @@
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { on } from '@ember/object/evented';
 import moment from 'moment';
 import attr from 'ember-data/attr';
 import ModelBase from 'open-event-frontend/models/base';
@@ -176,9 +175,6 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
 
   sessionsByState: computed('sessions', function() {
     return groupBy(this.sessions.toArray(), 'data.state');
-  }),
-
-  _ready: on('ready', function() {
-
   })
+
 });
diff --git a/app/models/user.js b/app/models/user.js
index ba19c31973d..94e87c7025b 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -1,6 +1,5 @@
 import { or } from '@ember/object/computed';
 import { computed } from '@ember/object';
-import { on } from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 import attr from 'ember-data/attr';
 import ModelBase from 'open-event-frontend/models/base';
@@ -98,11 +97,11 @@ export default ModelBase.extend({
   marketerEvents       : hasMany('event'),
   salesAdminEvents     : hasMany('event'),
 
-
-  _didUpdate: on('didUpdate', function(user) {
-    if (toString(user.id) === toString(this.authManager.currentUser.id)) {
-      user = this.store.peekRecord('user', user.id);
+  didUpdate() {
+    this._super(...arguments);
+    if (toString(this.id) === toString(this.authManager.currentUser.id)) {
+      const user = this.store.peekRecord('user', this.id);
       this.authManager.persistCurrentUser(user);
     }
-  })
+  }
 });