diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 1f6cfdb90..1846fd19e 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -17,7 +17,7 @@
           or create an account
         </a>
 
-        <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#getting-started" target="_blank" class="create-an-account">
+        <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#getting-started" target="_blank" title="Click here to see how to get started!" class="create-an-account">
           or create an account on another instance
         </a>
 
@@ -39,7 +39,7 @@
           type="password" name="password" id="password" i18n-placeholder placeholder="Password" required tabindex="2"
           formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
         >
-        <div i18n class="forgot-password-button" (click)="openForgotPasswordModal()">I forgot my password</div>
+        <a i18n class="forgot-password-button" (click)="openForgotPasswordModal()" title="Click here to reset your password">I forgot my password</a>
       </div>
       <div *ngIf="formErrors.password" class="form-error">
         {{ formErrors.password }}
diff --git a/client/src/app/login/login.component.scss b/client/src/app/login/login.component.scss
index 4a37ee961..900b2467a 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/login/login.component.scss
@@ -17,13 +17,7 @@ input[type=submit] {
   @include orange-button;
 }
 
-.forgot-password-button {
-  display: inline-block;
+.create-an-account, .forgot-password-button {
+  color: #000;
   cursor: pointer;
 }
-
-.create-an-account {
-  @include disable-default-a-behaviour;
-
-  color: #000;
-}