X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/40c7e0f9aa2fc0d1353818e5316da2203d114cf0..461bf3802df857c51a4ba8bc08bd311418cf72ed:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 64e1e157d..cf1a176f1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -53,7 +53,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
-    if params[:user][:email]
+    if params[:user] and params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
@@ -63,6 +63,8 @@ class UserController < ApplicationController
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end
+    else
+      render :action => 'lost_password'
     end
   end