diff --git a/lib/generators/devise/templates/simple_form_for/passwords/edit.html.erb b/lib/generators/devise/templates/simple_form_for/passwords/edit.html.erb
old mode 100755
new mode 100644
index fd2cb838..83fa36f6
--- a/lib/generators/devise/templates/simple_form_for/passwords/edit.html.erb
+++ b/lib/generators/devise/templates/simple_form_for/passwords/edit.html.erb
@@ -7,7 +7,7 @@
   <%= f.full_error :reset_password_token %>
 
   <div class="form-inputs">
-    <%= f.input :password, label: t(".new_password"), required: true, autofocus: true %>
+    <%= f.input :password, label: t(".new_password"), required: true, autofocus: true, hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length) %>
     <%= f.input :password_confirmation, label: t(".confirm_new_password"), required: true %>
   </div>
 
diff --git a/lib/generators/devise/templates/simple_form_for/registrations/edit.html.erb b/lib/generators/devise/templates/simple_form_for/registrations/edit.html.erb
old mode 100755
new mode 100644
index 97de47c6..73fc73c3
--- a/lib/generators/devise/templates/simple_form_for/registrations/edit.html.erb
+++ b/lib/generators/devise/templates/simple_form_for/registrations/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= t(".title", resource: resource_class.model_name.human) %></h2>
+<h2><%= t(".title", resource: resource_name.to_s.humanize) %></h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= f.error_notification %>
@@ -7,9 +7,7 @@
     <%= f.input :email, required: true, autofocus: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-      <p>
-        <%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %>
-      </p>
+      <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>
     <% end %>
 
     <%= f.input :password, autocomplete: "off", hint: t(".leave_blank_if_you_don_t_want_to_change_it"), required: false %>
diff --git a/lib/generators/devise/templates/simple_form_for/registrations/new.html.erb b/lib/generators/devise/templates/simple_form_for/registrations/new.html.erb
old mode 100755
new mode 100644
index 1c59a6dc..3f25bc75
--- a/lib/generators/devise/templates/simple_form_for/registrations/new.html.erb
+++ b/lib/generators/devise/templates/simple_form_for/registrations/new.html.erb
@@ -5,7 +5,7 @@
 
   <div class="form-inputs">
     <%= f.input :email, required: true, autofocus: true %>
-    <%= f.input :password, required: true %>
+    <%= f.input :password, required: true, hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length) %>
     <%= f.input :password_confirmation, required: true %>
   </div>