diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index fa314b5bc2..6d277aaa1b 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -26,7 +26,7 @@ import {
   RefreshTokenSuccessAction,
   RegistrationAction,
   RegistrationErrorAction,
-  RegistrationSuccessAction, RetrieveAuthMethodsErrorAction, RetrieveAuthMethodsSuccessAction
+  RegistrationSuccessAction, RetrieveAuthMethodsAction, RetrieveAuthMethodsErrorAction, RetrieveAuthMethodsSuccessAction
 } from './auth.actions';
 import { EPerson } from '../eperson/models/eperson.model';
 import { AuthStatus } from './models/auth-status.model';
@@ -88,6 +88,13 @@ export class AuthEffects {
       })
     );
 
+  @Effect()
+  public checkTokenError$: Observable<Action> = this.actions$
+    .pipe(
+    ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_ERROR),
+    map(() => new RetrieveAuthMethodsAction())
+    )
+
   @Effect()
   public createUser$: Observable<Action> = this.actions$.pipe(
       ofType(AuthActionTypes.REGISTRATION),
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 66ff22a0bf..19449c4b4d 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -19,11 +19,14 @@
          type="password">
   <div *ngIf="(error | async) && hasError" class="alert alert-danger" role="alert" @fadeOut>{{ (error | async) | translate }}</div>
   <div *ngIf="(message | async) && hasMessage" class="alert alert-info" role="alert" @fadeOut>{{ (message | async) | translate }}</div>
+
   <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [disabled]="!form.valid">{{"login.form.submit" | translate}}</button>
+
   <div *ngIf="(hasSsoLoginUrl | async)">
     <div class="text-center mt-2"><span class="align-middle">{{"login.form.or-divider" | translate}}</span></div>
     <a class="btn btn-lg btn-primary btn-block mt-2" [href]="(ssoLoginUrl | async)" role="button">{{"login.form.ssoLogin" | translate}}</a>
   </div>
+
   <div class="dropdown-divider"></div>
   <a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a>
   <a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a>