diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 3d5d68039..a83f2e2e2 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -79,6 +79,7 @@ export class AppComponent implements OnInit, AfterViewInit {
   hotkeysModalOpened = false
 
   private serverConfig: HTMLServerConfig
+  private userLoaded = false
 
   constructor (
     @Inject(DOCUMENT) private document: Document,
@@ -267,7 +268,10 @@ export class AppComponent implements OnInit, AfterViewInit {
   private listenUserChangeForModals () {
     this.authService.userInformationLoaded
         .pipe(map(() => this.authService.getUser()))
-        .subscribe(user => this.openModalsIfNeeded(user))
+        .subscribe(user => {
+          this.userLoaded = true
+          this.openModalsIfNeeded(user)
+        })
   }
 
   onModalCreated () {
@@ -278,6 +282,8 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private openModalsIfNeeded (user: User) {
+    if (!this.userLoaded) return
+
     if (user.role.id === UserRole.ADMINISTRATOR) {
       this.openAdminModalsIfNeeded(user)
     } else {
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 4f6097fea..7cad4928c 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -57,7 +57,7 @@
   overflow: hidden;
   width: 100%;
   height: 100%;
-  max-height: calc(100% - 50px); // Space for links below the menu
+  max-height: calc(100% - 75px); // Space for links below the menu
 }
 
 .main-menu-scrollbar {
diff --git a/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss b/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss
index 16a684890..499276f27 100644
--- a/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss
+++ b/client/src/app/shared/shared-main/menu/horizontal-menu.component.scss
@@ -4,7 +4,7 @@
 .root {
   width: 100%;
 
-  margin-bottom: 2rem;
+  @include rfs(2.5rem, margin-bottom);
 }
 
 h1 {
@@ -98,8 +98,6 @@ h1 {
 .children-container {
   margin-top: 1.25rem;
 
-  @include rfs(margin-bottom, 2.5rem);
-
   ::ng-deep li {
     white-space: nowrap;