diff --git a/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb b/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb
index 5865b73ed..3e5020c5c 100644
--- a/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb
+++ b/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.html.erb
@@ -3,5 +3,8 @@
 Reset Password! <%= @user.email %>
 <br/>
 Here is the token: <%= @user.reset_password_token %>
+<br/>
+Here is the URL to visit where you can type in your new password: 
+<%= "/reset_password_token?token=#{@user.reset_password_token}&email=#{CGI.escape(@user.email)}" %>
 </body>
 </html>
diff --git a/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.text.erb b/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.text.erb
index 263a237f2..7039fe433 100644
--- a/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.text.erb
+++ b/lib/jam_ruby/app/views/jam_ruby/user_mailer/password_reset.text.erb
@@ -1,2 +1,4 @@
 Reset Password! <%= @user.email %>
 Here is the token: <%= @user.reset_password_token %>
+Here is the URL to visit where you can type in your new password: 
+<%= "/reset_password_token?token=#{@user.reset_password_token}&email=#{CGI.escape(@user.email)}" %>
diff --git a/lib/jam_ruby/models/user.rb b/lib/jam_ruby/models/user.rb
index 9631bf2a0..cac051c10 100644
--- a/lib/jam_ruby/models/user.rb
+++ b/lib/jam_ruby/models/user.rb
@@ -212,6 +212,8 @@ module JamRuby
       user.save
 
       UserMailer.password_reset(user).deliver
+      
+      user
     end
 
     def self.band_index(user_id)