diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b8b3f51422..4556148986 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -252,7 +252,7 @@ module.exports = React.createClass({
         }
 
         this._sessionStore = sessionStore;
-        this._sessionStore.on('update', this._setStateFromSessionStore);
+        this._sessionStore.addListener(this._setStateFromSessionStore);
         this._setStateFromSessionStore();
     },
 
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index c20bc47152..4d8373bc52 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -68,15 +68,15 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        this.sessionStore = sessionStore;
-        this.sessionStore.on('update', this.setStateFromSessionStore);
+        this._sessionStore = sessionStore;
+        this._sessionStore.addListener(this._setStateFromSessionStore);
 
-        this.setStateFromSessionStore();
+        this._setStateFromSessionStore();
     },
 
-    setStateFromSessionStore: function() {
+    _setStateFromSessionStore: function() {
         this.setState({
-            cachedPassword: this.sessionStore.getCachedPassword(),
+            cachedPassword: this._sessionStore.getCachedPassword(),
         });
     },
 
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index d3370d2df3..1570f58688 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -1,21 +1,26 @@
 import dis from '../dispatcher';
-import EventEmitter from 'events';
+import {Store} from 'flux/utils';
 
 /**
  * A class for storing application state to do with the session. This is a simple flux
  * store that listens for actions and updates its state accordingly, informing any
- * listeners (views) of state changes via the 'update' event.
+ * listeners (views) of state changes.
+ *
+ * Usage:
+ *  ```
+ *  sessionStore.addListener(() => {
+ *   this.setState({ cachedPassword: sessionStore.getCachedPassword() })
+ *  })
+ *  ```
  */
-class SessionStore extends EventEmitter {
+class SessionStore extends Store {
     constructor() {
-        super();
+        super(dis);
 
         // Initialise state
         this._state = {
             cachedPassword: localStorage.getItem('mx_pass'),
         };
-
-        dis.register(this._onAction.bind(this));
     }
 
     _update() {
@@ -26,7 +31,7 @@ class SessionStore extends EventEmitter {
             localStorage.removeItem('mx_pass', this._state.cachedPassword);
         }
 
-        this.emit('update');
+        this.__emitChange();
     }
 
     _setState(newState) {
@@ -34,7 +39,7 @@ class SessionStore extends EventEmitter {
         this._update();
     }
 
-    _onAction(payload) {
+    __onDispatch(payload) {
         switch (payload.action) {
             case 'cached_password':
                 this._setState({