diff --git a/webclient/src/containers/Login/Login.tsx b/webclient/src/containers/Login/Login.tsx
index 85c121be2..dd50a788c 100644
--- a/webclient/src/containers/Login/Login.tsx
+++ b/webclient/src/containers/Login/Login.tsx
@@ -87,6 +87,10 @@ const Login = ({ state, description }: LoginProps) => {
     openActivateAccountDialog();
   }, ServerTypes.ACCOUNT_AWAITING_ACTIVATION, []);
 
+  useReduxEffect(() => {
+    resetSubmitButton();
+  }, [ServerTypes.LOGIN_FAILED], []);
+
   useReduxEffect(({ options: { hashedPassword } }) => {
     if (hostIdToRemember) {
       HostDTO.get(hostIdToRemember).then(host => {
diff --git a/webclient/src/forms/LoginForm/LoginForm.tsx b/webclient/src/forms/LoginForm/LoginForm.tsx
index 8218dc167..0f3779b5b 100644
--- a/webclient/src/forms/LoginForm/LoginForm.tsx
+++ b/webclient/src/forms/LoginForm/LoginForm.tsx
@@ -41,8 +41,6 @@ const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginForm
     setPasswordLabel(useStoredLabel ? STORED_PASSWORD_LABEL : PASSWORD_LABEL);
   };
 
-
-
   return (
     <Form onSubmit={onSubmit} validate={validate}>
       {({ handleSubmit, form }) => {
diff --git a/webclient/src/store/server/server.actions.ts b/webclient/src/store/server/server.actions.ts
index d1a3b2f45..3789d1e11 100644
--- a/webclient/src/store/server/server.actions.ts
+++ b/webclient/src/store/server/server.actions.ts
@@ -11,6 +11,9 @@ export const Actions = {
     type: Types.LOGIN_SUCCESSFUL,
     options
   }),
+  loginFailed: () => ({
+    type: Types.LOGIN_FAILED,
+  }),
   connectionClosed: reason => ({
     type: Types.CONNECTION_CLOSED,
     reason
diff --git a/webclient/src/store/server/server.dispatch.ts b/webclient/src/store/server/server.dispatch.ts
index a489edbc4..581fe2edf 100644
--- a/webclient/src/store/server/server.dispatch.ts
+++ b/webclient/src/store/server/server.dispatch.ts
@@ -9,6 +9,9 @@ export const Dispatch = {
   loginSuccessful: options => {
     store.dispatch(Actions.loginSuccessful(options));
   },
+  loginFailed: () => {
+    store.dispatch(Actions.loginFailed());
+  },
   connectionClosed: reason => {
     store.dispatch(Actions.connectionClosed(reason));
   },
diff --git a/webclient/src/store/server/server.types.ts b/webclient/src/store/server/server.types.ts
index 5767c3a8d..c797f3655 100644
--- a/webclient/src/store/server/server.types.ts
+++ b/webclient/src/store/server/server.types.ts
@@ -1,6 +1,7 @@
 export const Types = {
   CLEAR_STORE: '[Server] Clear Store',
   LOGIN_SUCCESSFUL: '[Server] Login Successful',
+  LOGIN_FAILED: '[Server] Login Failed',
   CONNECTION_CLOSED: '[Server] Connection Closed',
   SERVER_MESSAGE: '[Server] Server Message',
   UPDATE_BUDDY_LIST: '[Server] Update Buddy List',
diff --git a/webclient/src/websocket/commands/SessionCommands.ts b/webclient/src/websocket/commands/SessionCommands.ts
index 354d908a0..281c6ebfd 100644
--- a/webclient/src/websocket/commands/SessionCommands.ts
+++ b/webclient/src/websocket/commands/SessionCommands.ts
@@ -116,6 +116,7 @@ export class SessionCommands {
           SessionCommands.updateStatus(StatusEnum.DISCONNECTED, `Login failed: unknown error: ${raw.responseCode}`);
       }
 
+      SessionPersistence.loginFailed();
       SessionCommands.disconnect();
     });
   }
diff --git a/webclient/src/websocket/persistence/SessionPersistence.ts b/webclient/src/websocket/persistence/SessionPersistence.ts
index 78e385a28..f168a8686 100644
--- a/webclient/src/websocket/persistence/SessionPersistence.ts
+++ b/webclient/src/websocket/persistence/SessionPersistence.ts
@@ -13,6 +13,10 @@ export class SessionPersistence {
     ServerDispatch.loginSuccessful(options);
   }
 
+  static loginFailed() {
+    ServerDispatch.loginFailed();
+  }
+
   static connectionClosed(reason: number) {
     ServerDispatch.connectionClosed(reason);
   }