diff --git a/src/app/core/auth/models/auth-method.model.ts b/src/app/core/auth/models/auth-method.model.ts
index 7419769c5c..339d71dd4a 100644
--- a/src/app/core/auth/models/auth-method.model.ts
+++ b/src/app/core/auth/models/auth-method.model.ts
@@ -4,6 +4,7 @@ import { ShibbConstants } from '../../../+login-page/shibbolethTargetPage/const/
 export class AuthMethodModel {
   authMethodType: AuthMethodType;
   location?: string;
+  isStandalonePage?: any;
 
   constructor(authMethodName: string, location?: string) {
     switch (authMethodName) {
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index bb392f5d90..8488486d2b 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,6 +1,6 @@
 <ds-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-loading>
 <div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="form-login px-4 py-3">
-<ng-container *ngFor="let authMethodModel of injectedAuthMethods">
+<ng-container *ngFor="let authMethodModel of (authMethodData | async)">
   <ds-login-container
     [authMethodModel]="authMethodModel"></ds-login-container>
 </ng-container>
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 27ff86378f..cd273b68ad 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -5,7 +5,7 @@ import { select, Store } from '@ngrx/store';
 import { getAuthenticationMethods, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
 import { CoreState } from '../../core/core.reducers';
 import { InjectedAuthMethodModel } from './injectedAuthMethodModel/injectedAuthMethodModel';
-import { filter, takeWhile } from 'rxjs/operators';
+import { filter, takeWhile, tap } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
 
 @Component({
@@ -51,16 +51,29 @@ export class LogInComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.authMethodData = this.store.pipe(select(getAuthenticationMethods));
+    /*    this.store.pipe(
+          select(getAuthenticationMethods),
+          tap((authMethods) => console.log('authMethods: ', authMethods))
+        ).subscribe(
+          (authMethods) => this.authMethodData = authMethods
+        );*/
 
-    this.subscription = this.authMethodData.subscribe((methods) => this.authMethods = methods);
-    this.injectedAuthMethods = new Array<InjectedAuthMethodModel>();
-    // tslint:disable-next-line:forin
-    for (const index in this.authMethods) {
-      const injectedAuthMethod = new InjectedAuthMethodModel(this.authMethods[index].authMethodType, this.authMethods[index].location, this.isStandalonePage);
-      this.injectedAuthMethods.push(injectedAuthMethod);
-    }
-    console.log('injectedAuthMethods in ngOnInit(): ', this.injectedAuthMethods);
+    this.authMethodData = this.store.pipe(
+      select(getAuthenticationMethods),
+/*      tap((authMethods) => authMethods.forEach((method) => {
+        method.isStandalonePage = this.isStandalonePage;
+      }))*/
+    );
+    /*
+        this.subscription = this.authMethodData.subscribe((methods) => this.authMethods = methods);
+        this.injectedAuthMethods = new Array<InjectedAuthMethodModel>();
+        // tslint:disable-next-line:forin
+        for (const index in this.authMethods) {
+          const injectedAuthMethod = new InjectedAuthMethodModel(this.authMethods[index].authMethodType, this.authMethods[index].location, this.isStandalonePage);
+          this.injectedAuthMethods.push(injectedAuthMethod);
+        }
+        console.log('injectedAuthMethods in ngOnInit(): ', this.injectedAuthMethods);
+    */
 
     // set loading
     this.loading = this.store.pipe(select(isAuthenticationLoading));
@@ -81,7 +94,7 @@ export class LogInComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.subscription.unsubscribe();
+    // this.subscription.unsubscribe();
     this.alive = false;
   }