diff --git a/src/app/root/home/home.component.ts b/src/app/root/home/home.component.ts
index 6af594fc0d74b0e4e6fe69e6476e619bc936a4fa..0f41bfc87c64a5d66f3ef998e2117d46f14a1a95 100644
--- a/src/app/root/home/home.component.ts
+++ b/src/app/root/home/home.component.ts
@@ -503,6 +503,7 @@ export class HomeComponent implements OnInit, OnDestroy {
     this.connectionService.cleanUp();
     sessionStorage.removeItem(StorageKey.CurrentQuizName);
     sessionStorage.removeItem(StorageKey.CurrentNickName);
+    sessionStorage.removeItem(StorageKey.QuizToken);
     if (isPlatformBrowser(this.platformId)) {
       this.storageService.db.Config.delete(StorageKey.QuizTheme);
     }
diff --git a/src/app/root/login/login.component.html b/src/app/root/login/login.component.html
index b441c24da6335b583e83a67c1ccc488f13175ecf..b8be68fa1b3bb0714f2a55a0b33127793abfaa06 100644
--- a/src/app/root/login/login.component.html
+++ b/src/app/root/login/login.component.html
@@ -2,12 +2,12 @@
   <h4 class="text-center mb-5 mt-sm-5">{{'component.login.title' | translate}}</h4>
 
   <div *ngIf="hasUsernamePasswordLogin"
-       class="input-group input-group-sm">
+       class="input-group">
 
     <input (keydown.enter)="login()"
            [(ngModel)]="username"
            [placeholder]="'component.login.username' | translate"
-           class="form-control"
+           class="form-control my-2 my-sm-0"
            name="username"
            type="text"/>
 
@@ -32,7 +32,7 @@
     <h6 *ngIf="hasMultipleLoginMethods"
         class="mt-5">{{'component.login.login-via-token' | translate}}</h6>
 
-    <div class="input-group input-group-sm">
+    <div class="input-group">
 
       <input (keydown.enter)="login()"
              [(ngModel)]="token"
diff --git a/src/app/root/login/login.component.scss b/src/app/root/login/login.component.scss
index 7ab6237bc6a1cc91eab9d03f5922b8c0bc3d2253..1e0262fddd07622d4e159a5f37ad5e133365064a 100644
--- a/src/app/root/login/login.component.scss
+++ b/src/app/root/login/login.component.scss
@@ -17,8 +17,7 @@
     button,
     input[type="text"],
     input[type="password"] {
-      border-radius: 0.25rem;
       width: 100%;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/service/api/leaderboard/leaderboard-api.service.ts b/src/app/service/api/leaderboard/leaderboard-api.service.ts
index 10e226ff30455769fe301b3427a661429b61c7c5..8af04695d23454e2afd0532b4eb72f13013068f3 100644
--- a/src/app/service/api/leaderboard/leaderboard-api.service.ts
+++ b/src/app/service/api/leaderboard/leaderboard-api.service.ts
@@ -17,12 +17,7 @@ export class LeaderboardApiService {
   }
 
   public getLeaderboardData(quizName: string, amount: number, questionIndex?: number): Observable<IMessage> {
-    const headers: { [key: string]: string } = {};
-    if (sessionStorage.getItem(StorageKey.QuizToken)) {
-      headers.authorization = sessionStorage.getItem(StorageKey.QuizToken);
-    } else {
-      headers.authorization = sessionStorage.getItem(StorageKey.PrivateKey);
-    }
-    return this.http.get<IMessage>(this.LEADERBOARD_GET_DATA_URL(quizName, amount, questionIndex), { headers });
+    return this.http.get<IMessage>(this.LEADERBOARD_GET_DATA_URL(quizName, amount, questionIndex),
+      { headers: { authorization: sessionStorage.getItem(StorageKey.QuizToken) || sessionStorage.getItem(StorageKey.PrivateKey) } });
   }
 }