diff --git a/frontend/app/components/Login/Login.js b/frontend/app/components/Login/Login.js
index 4e628917d..7270944d1 100644
--- a/frontend/app/components/Login/Login.js
+++ b/frontend/app/components/Login/Login.js
@@ -129,7 +129,7 @@ class Login extends React.Component {
                   </div>
                 </div>
               </Loader>
-              {errors.length ? (
+              {errors && errors.length ? (
                 <div className={stl.errors}>
                   {errors.map((error) => (
                     <div className={stl.errorItem}>
diff --git a/frontend/app/duck/user.js b/frontend/app/duck/user.js
index 691e72e41..c2c149de5 100644
--- a/frontend/app/duck/user.js
+++ b/frontend/app/duck/user.js
@@ -30,6 +30,7 @@ export const initialState = Map({
   onboarding: false,
   sites: List(),
   jwt: null,
+  errors: List(),
   loginRequest: {
     loading: false,
     errors: []
@@ -77,8 +78,9 @@ const reducer = (state = initialState, action = {}) => {
     case UPDATE_PASSWORD.FAILURE:
       return state.set('passwordErrors', List(action.errors))
     case LOGIN.FAILURE:
+      console.log('login failed', action);
       deleteCookie('jwt', '/', 'openreplay.com')
-      return state.set('loginRequest', { loading: false, errors: ['Invalid username or password'] });
+      return state.set('loginRequest', { loading: false, errors: action.errors });
     case FETCH_ACCOUNT.FAILURE:
     case DELETE.SUCCESS:
     case DELETE.FAILURE:
@@ -100,6 +102,7 @@ const reducer = (state = initialState, action = {}) => {
 
 export default withRequestState({
   signupRequest: SIGNUP,
+  // loginRequest: LOGIN,
   updatePasswordRequest: UPDATE_PASSWORD,
   requestResetPassowrd: REQUEST_RESET_PASSWORD,
   resetPassword: RESET_PASSWORD,