diff --git a/src/app/app-root/login/login.component.html b/src/app/app-root/login/login.component.html
index fe0b7892db10c74bb940701e1693dd5526de8a83..b7a36bbea55725cca7d80fad63e1733144bcdc18 100644
--- a/src/app/app-root/login/login.component.html
+++ b/src/app/app-root/login/login.component.html
@@ -1,7 +1,6 @@
 <div fxLayout="row wrap" fxLayoutAlign="center stretch">
   <mat-card fxFlex="0 0 400px">
     <mat-card-title>Anmelden</mat-card-title>
-    <mat-card-header *ngIf="mds.globalWarning">{{mds.globalWarning}}</mat-card-header>
     <form [formGroup]="loginForm" (ngSubmit)="login()" *ngIf="mds.appConfig?.isValidApiVersion">
       <mat-card-content fxLayout="column">
         <mat-form-field>
@@ -24,7 +23,7 @@
     </form>
     <p style="color: chocolate"><b>{{ problemText }}</b></p>
     <p style="color: chocolate" *ngIf="!mds.appConfig?.isValidApiVersion"><b>Die Verbindung mit dem Server ist nicht möglich.</b></p>
-    <alert *ngIf="systemAnnouncement !== '-'" level="warning" [text]="systemAnnouncement"></alert>
+    <alert *ngIf="mds.globalWarning" level="warning" [text]="mds.globalWarning"></alert>
   </mat-card>
 
   <mat-card fxFlex="0 0 400px" class="mat-card-gray">
diff --git a/src/app/app-root/login/login.component.ts b/src/app/app-root/login/login.component.ts
index f65e5038c02d90a1015090fb8e43e3c51d69154f..e9377fb13ad79615d22bfa458a68b4690160ebe5 100644
--- a/src/app/app-root/login/login.component.ts
+++ b/src/app/app-root/login/login.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { CustomtextService } from 'iqb-components';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { MainDataService } from '../../maindata.service';
@@ -20,7 +19,6 @@ import { BackendService } from '../../backend.service';
 export class LoginComponent implements OnInit, OnDestroy {
   static oldLoginName = '';
   private routingSubscription: Subscription = null;
-  private systemAnnouncementSubscription: Subscription = null;
   returnTo = '';
   problemText = '';
   showPassword = false;
@@ -30,14 +28,11 @@ export class LoginComponent implements OnInit, OnDestroy {
     pw: new FormControl('')
   });
 
-  systemAnnouncement: string = '-';
-
   constructor(
     public mds: MainDataService,
     private bs: BackendService,
     private router: Router,
-    private route: ActivatedRoute,
-    private cts: CustomtextService
+    private route: ActivatedRoute
   ) { }
 
   ngOnInit(): void {
@@ -45,8 +40,6 @@ export class LoginComponent implements OnInit, OnDestroy {
     this.mds.appSubTitle$.next('Bitte Anmelden');
     this.routingSubscription = this.route.params
       .subscribe(params => { this.returnTo = params.returnTo; });
-    this.systemAnnouncementSubscription = <Subscription> this.cts.getCustomText$('system_announcement')
-      .subscribe(text => { this.systemAnnouncement = text || '-'; });
   }
 
   login(): void {