diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
deleted file mode 100644
index 1749c76a30..0000000000
--- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { By } from '@angular/platform-browser';
-import { Store, StoreModule } from '@ngrx/store';
-
-import { LogInPasswordComponent } from './log-in.component';
-import { authReducer } from '../../../../core/auth/auth.reducer';
-import { EPersonMock } from '../../../testing/eperson-mock';
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service-stub';
-import { AppState } from '../../../../app.reducer';
-
-describe('LogInComponent', () => {
-
-  let component: LogInPasswordComponent;
-  let fixture: ComponentFixture<LogInPasswordComponent>;
-  let page: Page;
-  let user: EPerson;
-
-  const authState = {
-    authenticated: false,
-    loaded: false,
-    loading: false,
-  };
-
-  beforeEach(() => {
-    user = EPersonMock;
-  });
-
-  beforeEach(async(() => {
-    // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
-      imports: [
-        FormsModule,
-        ReactiveFormsModule,
-        StoreModule.forRoot(authReducer),
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        LogInPasswordComponent
-      ],
-      providers: [
-        {provide: AuthService, useClass: AuthServiceStub}
-      ],
-      schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    })
-      .compileComponents();
-
-  }));
-
-  beforeEach(inject([Store], (store: Store<AppState>) => {
-    store
-      .subscribe((state) => {
-        (state as any).core = Object.create({});
-        (state as any).core.auth = authState;
-      });
-
-    // create component and test fixture
-    fixture = TestBed.createComponent(LogInPasswordComponent);
-
-    // get test component from the fixture
-    component = fixture.componentInstance;
-
-    // create page
-    page = new Page(component, fixture);
-
-    // verify the fixture is stable (no pending tasks)
-    fixture.whenStable().then(() => {
-      page.addPageElements();
-    });
-
-  }));
-
-  it('should create a FormGroup comprised of FormControls', () => {
-    fixture.detectChanges();
-    expect(component.form instanceof FormGroup).toBe(true);
-  });
-
-  it('should authenticate', () => {
-    fixture.detectChanges();
-
-    // set FormControl values
-    component.form.controls.email.setValue('user');
-    component.form.controls.password.setValue('password');
-
-    // submit form
-    component.submit();
-
-    // verify Store.dispatch() is invoked
-    expect(page.navigateSpy.calls.any()).toBe(true, 'Store.dispatch not invoked');
-  });
-});
-
-/**
- * I represent the DOM elements and attach spies.
- *
- * @class Page
- */
-class Page {
-
-  public emailInput: HTMLInputElement;
-  public navigateSpy: jasmine.Spy;
-  public passwordInput: HTMLInputElement;
-
-  constructor(private component: LogInPasswordComponent, private fixture: ComponentFixture<LogInPasswordComponent>) {
-    // use injector to get services
-    const injector = fixture.debugElement.injector;
-    const store = injector.get(Store);
-
-    // add spies
-    this.navigateSpy = spyOn(store, 'dispatch');
-  }
-
-  public addPageElements() {
-    const emailInputSelector = 'input[formcontrolname=\'email\']';
-    this.emailInput = this.fixture.debugElement.query(By.css(emailInputSelector)).nativeElement;
-
-    const passwordInputSelector = 'input[formcontrolname=\'password\']';
-    this.passwordInput = this.fixture.debugElement.query(By.css(passwordInputSelector)).nativeElement;
-  }
-}
diff --git a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
index 143d5a9729..6c65f0b14b 100644
--- a/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
+++ b/src/app/shared/log-in/methods/shibboleth/dynamic-shibboleth.component.ts
@@ -9,6 +9,7 @@ import { StartShibbolethAuthenticationAction } from '../../../../core/auth/auth.
 import { Observable } from 'rxjs';
 import { isAuthenticated, isAuthenticationLoading } from '../../../../core/auth/selectors';
 import { HttpClient } from '@angular/common/http';
+import { GLOBAL_CONFIG, GlobalConfig } from '../../../../../config';
 
 @Component({
   selector: 'ds-dynamic-shibboleth',
@@ -39,16 +40,23 @@ export class DynamicShibbolethComponent implements OnInit {
    */
   public shibbForm: FormGroup;
 
+  private host: string;
+
   /**
    * @constructor
    */
   constructor(@Inject('authMethodModelProvider') public injectedAuthMethodModel: AuthMethodModel,
+              @Inject(GLOBAL_CONFIG) private envConfig: GlobalConfig,
               private formBuilder: FormBuilder,
               private store: Store<CoreState>) {
     this.authMethodModel = injectedAuthMethodModel;
   }
 
   ngOnInit(): void {
+    console.log('conf: ',this.envConfig.rest.host);
+
+    this.host = this.envConfig.rest.host;
+
     // console.log('injectedAuthMethodModel', this.injectedAuthMethodModel);
     // set formGroup
     this.shibbForm = this.formBuilder.group({
@@ -65,6 +73,9 @@ export class DynamicShibbolethComponent implements OnInit {
 
   submit() {
     console.log('submit() was called');
-    this.store.dispatch(new StartShibbolethAuthenticationAction(this.authMethodModel))
+    this.store.dispatch(new StartShibbolethAuthenticationAction(this.authMethodModel));
+    this.host = 'fis.tiss.tuwien.ac.at';
+    // https://dspace.hostname/Shibboleth.sso/Login?target=https://dspace.hostname/shibboleth
+    window.location.href = 'https://' + this.host + '/Shibboleth.sso/Login?target=https://' + this.host + '/shibboleth';
   }
 }