diff --git a/lib/generators/devise/views_generator.rb b/lib/generators/devise/views_generator.rb
index f87fe374..59ab5fde 100644
--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -52,7 +52,7 @@ module Devise
 
     class SimpleFormForGenerator < Rails::Generators::Base #:nodoc:
       include ViewPathTemplates
-      source_root File.expand_path("../simple_form_for", __FILE__)
+      source_root File.expand_path("../../templates/simple_form_for", __FILE__)
       desc "Copies simple form enabled views to your application."
     end
 
diff --git a/lib/generators/devise/simple_form_for/confirmations/new.html.erb b/lib/generators/templates/simple_form_for/confirmations/new.html.erb
similarity index 79%
rename from lib/generators/devise/simple_form_for/confirmations/new.html.erb
rename to lib/generators/templates/simple_form_for/confirmations/new.html.erb
index 082ad577..9b0344e8 100644
--- a/lib/generators/devise/simple_form_for/confirmations/new.html.erb
+++ b/lib/generators/templates/simple_form_for/confirmations/new.html.erb
@@ -4,7 +4,7 @@
   <%= f.error_notification %>
 
   <div class="inputs">
-    <%= f.input :email %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="actions">
diff --git a/lib/generators/devise/simple_form_for/passwords/edit.html.erb b/lib/generators/templates/simple_form_for/passwords/edit.html.erb
similarity index 81%
rename from lib/generators/devise/simple_form_for/passwords/edit.html.erb
rename to lib/generators/templates/simple_form_for/passwords/edit.html.erb
index 6ffba761..be56ee41 100644
--- a/lib/generators/devise/simple_form_for/passwords/edit.html.erb
+++ b/lib/generators/templates/simple_form_for/passwords/edit.html.erb
@@ -7,7 +7,7 @@
   <%= f.full_error :reset_password_token %>
 
   <div class="inputs">
-    <%= f.input :password, :label => "New password" %>
+    <%= f.input :password, :label => "New password", :required => true %>
     <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
   </div>
 
diff --git a/lib/generators/devise/simple_form_for/passwords/new.html.erb b/lib/generators/templates/simple_form_for/passwords/new.html.erb
similarity index 78%
rename from lib/generators/devise/simple_form_for/passwords/new.html.erb
rename to lib/generators/templates/simple_form_for/passwords/new.html.erb
index 499af80f..56e2906f 100644
--- a/lib/generators/devise/simple_form_for/passwords/new.html.erb
+++ b/lib/generators/templates/simple_form_for/passwords/new.html.erb
@@ -4,7 +4,7 @@
   <%= f.error_notification %>
 
   <div class="inputs">
-    <%= f.input :email %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="actions">
diff --git a/lib/generators/devise/simple_form_for/registrations/edit.html.erb b/lib/generators/templates/simple_form_for/registrations/edit.html.erb
similarity index 100%
rename from lib/generators/devise/simple_form_for/registrations/edit.html.erb
rename to lib/generators/templates/simple_form_for/registrations/edit.html.erb
diff --git a/lib/generators/devise/simple_form_for/registrations/new.html.erb b/lib/generators/templates/simple_form_for/registrations/new.html.erb
similarity index 100%
rename from lib/generators/devise/simple_form_for/registrations/new.html.erb
rename to lib/generators/templates/simple_form_for/registrations/new.html.erb
diff --git a/lib/generators/devise/simple_form_for/sessions/new.html.erb b/lib/generators/templates/simple_form_for/sessions/new.html.erb
similarity index 100%
rename from lib/generators/devise/simple_form_for/sessions/new.html.erb
rename to lib/generators/templates/simple_form_for/sessions/new.html.erb
diff --git a/lib/generators/devise/simple_form_for/unlocks/new.html.erb b/lib/generators/templates/simple_form_for/unlocks/new.html.erb
similarity index 78%
rename from lib/generators/devise/simple_form_for/unlocks/new.html.erb
rename to lib/generators/templates/simple_form_for/unlocks/new.html.erb
index 65c95c6a..89011af0 100644
--- a/lib/generators/devise/simple_form_for/unlocks/new.html.erb
+++ b/lib/generators/templates/simple_form_for/unlocks/new.html.erb
@@ -4,7 +4,7 @@
   <%= f.error_notification %>
 
   <div class="inputs">
-    <%= f.input :email %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="actions">