diff --git a/client/modules/User/actions.js b/client/modules/User/actions.js
index c28425d2..ecdfa3c5 100644
--- a/client/modules/User/actions.js
+++ b/client/modules/User/actions.js
@@ -69,7 +69,7 @@ export function validateAndLoginUser(formProps, dispatch) {
         resolve();
       })
       .catch(response => {
-        reject({ email: response.data.message, _error: 'Login failed!' });
+        reject({ password: response.data.message, _error: 'Login failed!' });
       });
   });
 }
diff --git a/client/modules/User/components/LoginForm.js b/client/modules/User/components/LoginForm.js
index 605e13d9..4f872c81 100644
--- a/client/modules/User/components/LoginForm.js
+++ b/client/modules/User/components/LoginForm.js
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 
 function LoginForm(props) {
-  const { fields: { email, password }, handleSubmit, submitting, invalid, pristine } = props;
+  const { fields: { email, password }, handleSubmit, submitting, pristine } = props;
   return (
     <form className="login-form" onSubmit={handleSubmit(props.validateAndLoginUser.bind(this))}>
       <p className="login-form__field">
@@ -24,7 +24,7 @@ function LoginForm(props) {
         />
         {password.touched && password.error && <span className="form-error">{password.error}</span>}
       </p>
-      <input type="submit" disabled={submitting || invalid || pristine} value="Login" aria-label="login" />
+      <input type="submit" disabled={submitting || pristine} value="Login" aria-label="login" />
     </form>
   );
 }