diff --git a/src/app/components/shared/login/login.component.html b/src/app/components/shared/login/login.component.html
index 68e0a2a986a7015ffd945a864383be5816af5a8e..01e85e02defd5f7310021b121909e18c0ef8323a 100644
--- a/src/app/components/shared/login/login.component.html
+++ b/src/app/components/shared/login/login.component.html
@@ -1,5 +1,4 @@
-<form fxLayout="column" fxLayoutAlign="space-around"
-      fxLayoutGap="10px">
+<form fxLayout="column" fxLayoutAlign="space-around" fxLayoutGap="5px">
   <mat-form-field class="input-block">
     <input matInput #userEmail placeholder="{{ 'login.email' | translate }}" [formControl]="usernameFormControl"
            [errorStateMatcher]="matcher" name="username"/>
@@ -15,16 +14,19 @@
            [formControl]="passwordFormControl" [errorStateMatcher]="matcher" name="password"/>
     <mat-error *ngIf="passwordFormControl.hasError('required')">{{ 'login.password-required' | translate }}</mat-error>
   </mat-form-field>
-  <div align="start">
-    <button mat-button color="primary" class="pwReset" (click)="openPasswordDialog()">
-      {{ 'login-page.password-reset' | translate }}
-  </button>
-  </div>
   <button mat-raised-button color="accent" (click)="login(userEmail.value, userPassword.value)">{{ 'login.login' | translate }}</button>
   <button mat-raised-button *ngIf="guestAllowed === true" color="primary" (click)="guestLogin()" type="button" class="guestButton">
     {{ 'login.guest-login' | translate }}
   </button>
-  <button mat-button color="primary" (click)="openRegisterDialog()">
+  <div align="start">
+      <button mat-button color="primary" class="pwReset" (click)="openPasswordDialog()">
+        {{ 'login-page.password-reset' | translate }}
+    </button>
+  </div>
+  <div fxLayout="row">
+    <p>Noch keinen Account?</p>
+    <button mat-button color="primary" class="regButton" (click)="openRegisterDialog()">
       {{ 'login-page.register' | translate }}
     </button>
+  </div>
 </form>
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index 6414925dfb43c8488af490d9c68d13a7044399e1..bdb5da25a13399581499b15b859b333f9d59bbbc 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -1,7 +1,16 @@
-form {
-  padding: 10px;
-}
-
 .pwReset {
   padding-left: 0px;
 }
+
+.regButton {
+  margin-top: 20px;
+  padding: 0px;
+}
+
+p {
+  font-size: small;
+  margin-bottom: 0px;
+  margin-top: 30px;
+  margin-left: 30px;
+  margin-right: 5px;
+}
\ No newline at end of file