--- a/client/src/reducers/authReducer.js	Mon Jun 26 15:45:50 2017 +0200
+++ b/client/src/reducers/authReducer.js	Mon Jun 26 16:43:22 2017 +0200
@@ -8,7 +8,6 @@
     case types.AUTH_LOGOUT:
       return false;
     case types.AUTH_LOGIN_SUCCESS:
-    case types.AUTH_REGISTER_SUCCESS:
       return true;
     default:
       return state;
@@ -21,7 +20,6 @@
     case types.AUTH_LOGOUT:
       return null;
     case types.AUTH_LOGIN_SUCCESS:
-    case types.AUTH_REGISTER_SUCCESS:
       return new UserRecord(action.user);
     case types.USER_UPDATE_SETTINGS:
       return state.merge({
@@ -49,6 +47,7 @@
   loading: false,
   success: false,
   error: false,
+  errorMessages: Immutable.Map({})
 });
 
 export const login = (state = loginState, action) => {
@@ -65,6 +64,7 @@
         loading: false,
         success: action.type === types.AUTH_LOGIN_SUCCESS,
         error: action.type === types.AUTH_LOGIN_ERROR,
+        errorMessages: action.type === types.AUTH_LOGIN_ERROR ? Immutable.Map(action.error) : Immutable.Map({})
       })
     default:
       return state
@@ -86,11 +86,11 @@
         success: false,
         error: false,
       })
-    case types.AUTH_REGISTER_SUCCESS:
+    case types.AUTH_LOGIN_SUCCESS:
     case types.AUTH_REGISTER_ERROR:
       return Immutable.Map({
         loading: false,
-        success: action.type === types.AUTH_REGISTER_SUCCESS,
+        success: action.type === types.AUTH_LOGIN_SUCCESS,
         error: action.type === types.AUTH_REGISTER_ERROR,
         errorMessages: action.type === types.AUTH_REGISTER_ERROR ? Immutable.Map(action.error) : Immutable.Map({})
       })