diff --git a/app/models/user.rb b/app/models/user.rb
index 256cfad..56a8f5f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -97,13 +97,17 @@ def average_rating(from:, to:)
   end
 
   def forgot_password!
-    update(
+    self.skip_password_validation = true
+
+    update!(
       password_reset_token: SecureRandom.hex,
       password_reset_token_expiration: Time.current + 2.hours
     )
   end
 
   def eligible_for_password_reset
+    return false unless password_reset_token_expiration.present?
+
     password_reset_token_expiration > Time.current
   end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 91a4d0d..f000e8f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-  <link href="https://fonts.googleapis.com/css?family=Karla:400,700" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Karla:400,700&subset=latin" rel="stylesheet">
   <%= favicon_link_tag 'favicon' %>
   <link rel="apple-touch-icon" sizes="152x152" href="/assets/apple-icon.png" />
   <%#
diff --git a/app/views/passwords/edit.html.erb b/app/views/passwords/edit.html.erb
index 8281ff8..f4c901d 100644
--- a/app/views/passwords/edit.html.erb
+++ b/app/views/passwords/edit.html.erb
@@ -13,7 +13,9 @@
             <li>Isn't in the <%= link_to 'top 100', 'https://raw.githubusercontent.com/danielmiessler/SecLists/master/Passwords/10_million_password_list_top_100.txt'%> most common passwords <span class="xMark"></span></li>
           </ol>
         </div>
-        <%= password_field_tag :password, nil, id: "reset_password", data: { rules: "checkLength,checkTop100" } %>
+        <div id="showHidePassword">
+          <%= password_field_tag :password, nil, id: "reset_password", data: { rules: "checkLength,checkTop100" } %>
+        </div>
       </div>
 
       <div class="inputGroup flexRow flexAlignCenter">