diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 18cb82e..e12be28 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -63,8 +63,8 @@ export class AppComponent {
   }
 
   logout() {
+    this.navService.closeNav();
     this.authService.logout().subscribe().add(() => this.router.navigate(['login']));
-    this.sideNav.close();
   }
 
   ngAfterViewInit() {
diff --git a/src/app/components/sidenav-profile/sidenav-profile.component.html b/src/app/components/sidenav-profile/sidenav-profile.component.html
index 275b3cd..0164f65 100644
--- a/src/app/components/sidenav-profile/sidenav-profile.component.html
+++ b/src/app/components/sidenav-profile/sidenav-profile.component.html
@@ -1,4 +1,4 @@
-<div routerLink = "/profile" >
+<div routerLink = "/profile" class="sidenav-profile">
     <img class="navbar-photo" src={{profileURL}}>
     <p>{{name}}</p>
     <p>{{email}}</p>
diff --git a/src/app/components/sidenav-profile/sidenav-profile.component.scss b/src/app/components/sidenav-profile/sidenav-profile.component.scss
index 59bf5b8..d210ece 100644
--- a/src/app/components/sidenav-profile/sidenav-profile.component.scss
+++ b/src/app/components/sidenav-profile/sidenav-profile.component.scss
@@ -5,4 +5,8 @@
     height:100px;
     border-radius:50%;
     margin-top:10px;
+}
+
+.sidenav-profile {
+    outline: none;
 }
\ No newline at end of file
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
index 29f2c04..8487c7b 100644
--- a/src/app/pages/login/login.component.html
+++ b/src/app/pages/login/login.component.html
@@ -1,41 +1,46 @@
-<div id="login-form">
+<div id="login-wrapper">
   <h1>fLotte Login</h1>
-  <mat-form-field (keyup.enter)="login()">
-    <mat-label>E-Mail-Adresse eingeben</mat-label>
-    <input matInput placeholder="fLotte@beispiel.de" [formControl]="email" />
-    <mat-error *ngIf="email.hasError('required')">
-      Bitte geben Sie eine E-Mail-Adresse ein.
-    </mat-error>
-    <mat-error *ngIf="email.hasError('email')">
-      Bitte geben Sie eine valide E-Mail-Adresse ein.
-    </mat-error>
-  </mat-form-field>
+  <form id="login-form">
+    <mat-form-field (keyup.enter)="login()">
+      <mat-label>E-Mail-Adresse eingeben</mat-label>
+      <input matInput placeholder="fLotte@beispiel.de" autocomplete="email" [formControl]="email" />
+      <mat-error *ngIf="email.hasError('required')">
+        Bitte geben Sie eine E-Mail-Adresse ein.
+      </mat-error>
+      <mat-error *ngIf="email.hasError('email')">
+        Bitte geben Sie eine valide E-Mail-Adresse ein.
+      </mat-error>
+    </mat-form-field>
 
-  <mat-form-field (keyup.enter)="login()">
-    <mat-label>Passwort eingeben</mat-label>
-    <input
-      matInput
-      [type]="hide ? 'password' : 'text'"
-      [formControl]="password"
-    />
-    <mat-error *ngIf="password.hasError('required')">
-      Bitte geben Sie Ihr Passwort ein.
-    </mat-error>
-    <button
-      mat-icon-button
-      matSuffix
-      (click)="hide = !hide"
-      [attr.aria-label]="'Hide password'"
-      [attr.aria-pressed]="hide"
-    >
-      <mat-icon>{{ hide ? "visibility_off" : "visibility" }}</mat-icon>
-    </button>
-  </mat-form-field>
-  <mat-progress-bar mode="indeterminate" id="loading-bar" *ngIf="loading"></mat-progress-bar>
-  <button mat-stroked-button color="primary" (click)="login()">
-    Login
-  </button>
+    <mat-form-field (keyup.enter)="login()">
+      <mat-label>Passwort eingeben</mat-label>
+      <input
+        matInput
+        autocomplete="password"
+        [type]="hide ? 'password' : 'text'"
+        [formControl]="password"
+      />
+      <mat-error *ngIf="password.hasError('required')">
+        Bitte geben Sie Ihr Passwort ein.
+      </mat-error>
+      <button
+        mat-icon-button
+        matSuffix
+        (click)="hide = !hide"
+        [attr.aria-label]="'Hide password'"
+        [attr.aria-pressed]="hide"
+      >
+        <mat-icon>{{ hide ? "visibility_off" : "visibility" }}</mat-icon>
+      </button>
+    </mat-form-field>
+  </form>
+  <mat-progress-bar
+    mode="indeterminate"
+    id="loading-bar"
+    *ngIf="loading"
+  ></mat-progress-bar>
+  <button mat-stroked-button color="primary" (click)="login()">Login</button>
   <mat-error class="login-error-message" *ngIf="errorOccurred">
-    {{errorMessage}}
+    {{ errorMessage }}
   </mat-error>
 </div>
diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss
index 5e33d01..cf656e5 100644
--- a/src/app/pages/login/login.component.scss
+++ b/src/app/pages/login/login.component.scss
@@ -1,4 +1,7 @@
-#login-form {
+#login-wrapper {
+    #login-form {
+        display: contents;
+    }
     display: flex;
     flex-direction: column;
     max-width: 32em;