Nearing feature complete for driver auth

Web/Controllers/AccountController.cs

@@ -3,6 +3,7 @@ using System.Web.Mvc;
 using System.Web.Security;
 using MileageTraker.Web.DAL;
 using MileageTraker.Web.Email;
+using MileageTraker.Web.Models;
 using MileageTraker.Web.Utility;
 using MileageTraker.Web.ViewModels.Account;
 
@@ -146,20 +147,9 @@ namespace MileageTraker.Web.Controllers
 			var user = DataService.FindUserByUsername(viewModel.Username);
 			if (user != null && Request.Url != null)
 			{
-				var passwordResetToken = Algorithms.GenerateToken();
-				var url = Request.Url.Scheme + 
-					@"://" +
-					Request.Url.Authority +
-					Url.Action("NewPassword", "Account",
-						new NewPasswordViewModel
-						{
-							UserId = user.UserId,
-							PasswordResetToken = passwordResetToken
-						});
-				user.PasswordResetToken = passwordResetToken;
-				DataService.UpdateUser(user);
 				var email = new EmailNotificationService();
-				email.NotifyResetPassword(user,url);
+				var resetPasswordUrl = ResetPassword(user);
+				email.SendResetPassword(user, resetPasswordUrl);
 			}
 
 			TempData["StatusMessage"] = "Please check your email - we have sent a request for you to reset the password.";