diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 325cb8bde5f..369f3d7c728 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -42,7 +42,7 @@
             <Input
               @value={{this.loginPassword}}
               class={{value-entered this.loginPassword}}
-              @type="password"
+              @type={{if this.maskPassword "password" "text"}}
               id="login-account-password"
               maxlength="200"
               disabled={{this.showSecondFactor}}
@@ -50,11 +50,17 @@
             <label class="alt-placeholder" for="login-account-password">{{i18n
                 "login.password"
               }}</label>
-            <a
-              href
-              id="forgot-password-link"
-              {{on "click" this.handleForgotPassword}}
-            >{{i18n "forgot_password.action"}}</a>
+            <div class="login__password-links">
+              <a
+                href
+                id="forgot-password-link"
+                {{on "click" this.handleForgotPassword}}
+              >{{i18n "forgot_password.action"}}</a>
+              <TogglePasswordMask
+                @maskPassword={{this.maskPassword}}
+                @togglePasswordMask={{this.togglePasswordMask}}
+              />
+            </div>
           </div>
         </div>
         <SecondFactorForm