diff --git a/lib/open_fest/app/controllers/open_fest/users/passwords_controller.rb b/lib/open_fest/app/controllers/open_fest/users/passwords_controller.rb
index be5e06e..892c2d6 100644
--- a/lib/open_fest/app/controllers/open_fest/users/passwords_controller.rb
+++ b/lib/open_fest/app/controllers/open_fest/users/passwords_controller.rb
@@ -1,3 +1,7 @@
 class OpenFest::Users::PasswordsController < Devise::PasswordsController
   include OpenFest::Users::DeviseController
+
+  def after_sending_reset_password_instructions_path_for(resource_name)
+    new_user_session_path
+  end
 end
diff --git a/lib/open_fest/app/views/open_fest/users/confirmations/new.slim b/lib/open_fest/app/views/open_fest/users/confirmations/new.slim
index 72c8dca..d0dad8b 100644
--- a/lib/open_fest/app/views/open_fest/users/confirmations/new.slim
+++ b/lib/open_fest/app/views/open_fest/users/confirmations/new.slim
@@ -2,7 +2,7 @@
 
 h2.entry-title = t :resend_instructions_header
 
-= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+= simple_form_for(resource, wrapper: :default, as: :user, url: user_confirmation_path) do |f|
   = f.error_notification
   = f.full_error :confirmation_token
 
diff --git a/lib/open_fest/app/views/open_fest/users/passwords/edit.slim b/lib/open_fest/app/views/open_fest/users/passwords/edit.slim
index f39bcb7..a49e4bc 100644
--- a/lib/open_fest/app/views/open_fest/users/passwords/edit.slim
+++ b/lib/open_fest/app/views/open_fest/users/passwords/edit.slim
@@ -2,7 +2,7 @@
 
 h2.entry-title = t :change_pass
 
-= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+= simple_form_for(resource, wrapper: :default, as: :user, url: user_password_path, html: { method: :put }) do |f|
   = f.error_notification
 
   = f.input :reset_password_token, as: :hidden
diff --git a/lib/open_fest/app/views/open_fest/users/passwords/new.slim b/lib/open_fest/app/views/open_fest/users/passwords/new.slim
index 7e1f90c..55f2297 100644
--- a/lib/open_fest/app/views/open_fest/users/passwords/new.slim
+++ b/lib/open_fest/app/views/open_fest/users/passwords/new.slim
@@ -2,7 +2,7 @@
 
 h2.entry-title = t :lostpass
 
-= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+= simple_form_for(resource, wrapper: :default, as: :user, url: user_password_path) do |f|
   = f.error_notification
 
   .form-inputs
diff --git a/lib/open_fest/app/views/open_fest/users/registrations/new.slim b/lib/open_fest/app/views/open_fest/users/registrations/new.slim
index 6f7c3fe..bb5f2c2 100644
--- a/lib/open_fest/app/views/open_fest/users/registrations/new.slim
+++ b/lib/open_fest/app/views/open_fest/users/registrations/new.slim
@@ -2,7 +2,7 @@
 
 h2.entry-title = t :registration
 
-= simple_form_for(resource, as: resource_name, url: user_registration_path) do |f|
+= simple_form_for(resource, wrapper: :default, as: :user, url: user_registration_path) do |f|
   = f.error_notification
 
   .form-inputs
diff --git a/lib/open_fest/app/views/open_fest/users/sessions/new.slim b/lib/open_fest/app/views/open_fest/users/sessions/new.slim
index baeef8e..ad15150 100644
--- a/lib/open_fest/app/views/open_fest/users/sessions/new.slim
+++ b/lib/open_fest/app/views/open_fest/users/sessions/new.slim
@@ -2,7 +2,7 @@
 
 h2.entry-title = t :login
 
-= simple_form_for(resource, wrapper: :default, as: resource_name, url: user_session_path) do |f|
+= simple_form_for(resource, wrapper: :default, as: :user, url: user_session_path) do |f|
   .form-inputs
     = f.input :email, required: false, autofocus: true, hint: false
     = f.input :password, required: false, hint: false