diff --git a/apps/web/src/app/accounts/login/login.component.html b/apps/web/src/app/accounts/login/login.component.html
index 80c4c1455d..3b7724559f 100644
--- a/apps/web/src/app/accounts/login/login.component.html
+++ b/apps/web/src/app/accounts/login/login.component.html
@@ -72,8 +72,8 @@
 </form>
 
 <ng-template [formGroup]="formGroup" #loginPage>
-  <div class="tw-mb-3">
-    <bit-form-field>
+  <div class="tw-mb-6 tw-h-28">
+    <bit-form-field class="!tw-mb-1">
       <bit-label>{{ "masterPass" | i18n }}</bit-label>
       <input
         id="login_input_master-password"
@@ -89,10 +89,10 @@
           [ngClass]="{ 'bwi-eye': !showPassword, 'bwi-eye-slash': showPassword }"
         ></i>
       </button>
-      <bit-hint>
-        <a routerLink="/hint" (click)="setFormValues()">{{ "getMasterPasswordHint" | i18n }}</a>
-      </bit-hint>
     </bit-form-field>
+    <a class="-tw-mt-2" routerLink="/hint" (mousedown)="goToHint()" (click)="setFormValues()">{{
+      "getMasterPasswordHint" | i18n
+    }}</a>
   </div>
 
   <div [hidden]="!showCaptcha()">
diff --git a/apps/web/src/app/accounts/login/login.component.ts b/apps/web/src/app/accounts/login/login.component.ts
index d461c04c81..100e240c6b 100644
--- a/apps/web/src/app/accounts/login/login.component.ts
+++ b/apps/web/src/app/accounts/login/login.component.ts
@@ -184,6 +184,11 @@ export class LoginComponent extends BaseLoginComponent implements OnInit, OnDest
     }
   }
 
+  goToHint() {
+    this.setFormValues();
+    this.router.navigateByUrl("/hint");
+  }
+
   async submit() {
     const rememberEmail = this.formGroup.value.rememberEmail;