diff --git a/frontend/src/app/pages/welcome-root/welcome-root.component.html b/frontend/src/app/pages/welcome-root/welcome-root.component.html
index eca24b6..66b459d 100644
--- a/frontend/src/app/pages/welcome-root/welcome-root.component.html
+++ b/frontend/src/app/pages/welcome-root/welcome-root.component.html
@@ -458,10 +458,11 @@
 <div
   class="modal modal-open"
   *ngIf="
-    isTokenVerified() ||
-    isVerifying() ||
-    verificationError() ||
-    isAutoLoginInProgress()
+    (isTokenVerified() ||
+      isVerifying() ||
+      verificationError() ||
+      isAutoLoginInProgress()) &&
+    isValidLoginAttempt()
   "
   tabindex="-1"
   aria-labelledby="verify-modal-title"
diff --git a/frontend/src/app/pages/welcome-root/welcome-root.component.ts b/frontend/src/app/pages/welcome-root/welcome-root.component.ts
index 94d5d83..a44aa03 100644
--- a/frontend/src/app/pages/welcome-root/welcome-root.component.ts
+++ b/frontend/src/app/pages/welcome-root/welcome-root.component.ts
@@ -254,6 +254,10 @@ export class WelcomeRootComponent implements OnInit {
     }
   }
 
+  public isValidLoginAttempt(): boolean {
+    return this.signin() && this.token() !== '';
+  }
+
   private focusPasswordField(): void {
     if (this.passwordInput) {
       this.passwordInput.nativeElement.focus();
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 4f87c75..7d144a5 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -8,3 +8,8 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+
+:root:has(:is(.modal-open, .modal:target, .modal-toggle:checked + .modal, .modal[open])) {
+  scrollbar-gutter: auto
+;}