diff --git a/ToDo.txt b/ToDo.txt
index 93de4f0..3d24646 100755
--- a/ToDo.txt
+++ b/ToDo.txt
@@ -14,12 +14,6 @@ ProjectMistData.cs
 
 account/resetpassword
     make the account your resetting password for visible in ui
-    Passwords aren't obscured
-    After sucess and 3 seconds pass, change location to login frame
-
-ForgotPassword
-    No notice something is happening when button pressed
-    When the email is sent and waiting on timeout the error is : something went wrong and it should be cannot send email request that quickly
 
 ForgotPassword Email / Resetpassword Email
     Needs styles that match the theme of the website
\ No newline at end of file
diff --git a/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ForgotPassword.razor b/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ForgotPassword.razor
index 10c3714..fefc28c 100755
--- a/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ForgotPassword.razor
+++ b/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ForgotPassword.razor
@@ -34,7 +34,7 @@
     }
 
     public async Task TrySendCode() {
-        
+        Result = "Waiting on response from server";
         HttpResponseMessage TestLogin = await Http.PostAsJsonAsync("api/account/sendresetpassword", new Account(){ Email = Email });
         Result = await TestLogin.Content.ReadAsStringAsync();
 
diff --git a/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ResetPassword.razor b/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ResetPassword.razor
index 5fb2d27..80beacd 100755
--- a/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ResetPassword.razor
+++ b/src/MistoxWebsite.Client/Pages/Account/ActivityPages/ResetPassword.razor
@@ -4,6 +4,7 @@
 
 <form class="center big-frame background-border">
     <h3>Reset Password</h3>
+    <span>User: @UserName</span>
     <div class="frame-item">
         <input type="password" placeholder=" " @bind="NewPassword" @onkeyup="OnKeyDown" />
         <label>New Password</label>
@@ -48,10 +49,17 @@
     }
 
     protected async Task TryChange() {
-
+        Result = "Waiting on response from server";
         HttpResponseMessage TestLogin = await Http.PostAsJsonAsync("api/account/resetpassword", new Account(){ UserName = UserName, PasswordHash = NewPassword, Error = ResetPwd });
         string result = await TestLogin.Content.ReadAsStringAsync();
-        Result = result == "true" ? "Password changed successfully" : "Something is wrong";
+        bool success = result == "true" ? true : false;
+        if (success){
+            Result = "Password changed successfully";
+            await Task.Delay(2000);
+            Nav.NavigateTo("/", true);
+        }else{
+            Result = "Something is wrong";
+        }
     }
 
 }