<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -39,18 +39,6 @@ class UserController &lt; ApplicationController
 		end
   end
 
-  def save_password
-    @user = User.find(params[:id])
-    @user.reset_password_code = nil 
-    @user.reset_password_code_until = nil 
-		if @user.update_attributes(params[:user])
-			flash[:success] = 'Password was successfully updated.'
-			redirect_to(new_login_path)
-		else
-			render(:controller =&gt; :user, :action =&gt; :edit_password, :id =&gt; @user.id)
-		end
-  end
-
 	def check_username_availability
 		if params[:user][:username].blank?
 			message = &quot;Username should not be blank.&quot;
@@ -78,8 +66,9 @@ class UserController &lt; ApplicationController
       email = UserNotifier.deliver_forgot_password(user)
       render(:text =&gt; &quot;&lt;pre&gt;&quot; + email.encoded + &quot;&lt;/pre&gt;&quot;)
     else
-      render(:text =&gt; &quot;User not found: #{params[:email]}&quot;)
-    end
+      flash.now[:error]=&quot;InValid Email Address : Re-Enter&quot;
+      render(:controller =&gt; :user, :action =&gt; :enter_email)
+    end 
   end
 
   def reset_password
@@ -91,6 +80,18 @@ class UserController &lt; ApplicationController
       redirect_to(new_login_path)
     end
   end
+
+  def save_password
+    @user = User.find(params[:id])
+    @user.reset_password_code = nil 
+    @user.reset_password_code_until = nil 
+		if @user.update_attributes(params[:user])
+			flash[:success] = 'Password was successfully updated.'
+			redirect_to(new_login_path)
+		else
+			render(:controller =&gt; :user, :action =&gt; :edit_password, :id =&gt; @user.id)
+		end
+  end
 end
 
 </diff>
      <filename>app/controllers/user_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
 &lt;% form_tag :controller =&gt; :user, :action =&gt; 'forgot_password' do %&gt;
-Enter Email: &lt;%= text_field_tag :email %&gt;
-&lt;%= submit_tag &quot;Send&quot; %&gt;
+  &lt;p&gt;Enter Email: &lt;%= text_field_tag :email %&gt;&lt;/p&gt;
+  &lt;%= submit_tag &quot;Send&quot; %&gt;
 &lt;% end %&gt;</diff>
      <filename>app/views/user/enter_email.html.erb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>049283321888cfe0b0382c8dd9cbe291ebfea7d5</id>
    </parent>
  </parents>
  <author>
    <name>Payal Gupta</name>
    <email>cool.payal1985@gmail.com</email>
  </author>
  <url>http://github.com/payalgupta/todo-list/commit/cffe4eee2a8ee2098859052416ad599124f8a2fb</url>
  <id>cffe4eee2a8ee2098859052416ad599124f8a2fb</id>
  <committed-date>2008-07-29T05:28:46-07:00</committed-date>
  <authored-date>2008-07-29T05:28:46-07:00</authored-date>
  <message>Valid Email Check in forgot password</message>
  <tree>9776c0533b8eec012188e984890da661a721b183</tree>
  <committer>
    <name>Payal Gupta</name>
    <email>cool.payal1985@gmail.com</email>
  </committer>
</commit>
