diff --git a/back/tmeit_backend/models/passwordreset.py b/back/tmeit_backend/models/password_reset.py
similarity index 96%
rename from back/tmeit_backend/models/passwordreset.py
rename to back/tmeit_backend/models/password_reset.py
index 1835507..3ace58a 100644
--- a/back/tmeit_backend/models/passwordreset.py
+++ b/back/tmeit_backend/models/password_reset.py
@@ -13,7 +13,7 @@ class PasswordReset(Base):
     It is also stored here together with the users UUID.
     If the reset password endpoint is accessed this table is checked to ensure that the link is valid and to which user it pertains.
     """
-    __tablename__ = "passwordreset"
+    __tablename__ = "password_reset"
     # Key which is shared in email
     hashed_reset_token = Column(String, primary_key=True, index=True)
     # The user which this reset record is connected to
diff --git a/back/tmeit_backend/worker_tasks/send_password_reset_email.py b/back/tmeit_backend/worker_tasks/send_password_reset_email.py
index 04cfd23..0f21162 100644
--- a/back/tmeit_backend/worker_tasks/send_password_reset_email.py
+++ b/back/tmeit_backend/worker_tasks/send_password_reset_email.py
@@ -23,7 +23,7 @@ async def send_password_reset_email(ctx: WorkerContext, email: str, reset_token:
         f'Hi {full_name},\n\n'
         'You are receiving this email since a pasword reset has been requested for your tmeit account.\n\n'
         'If you did not make this request, please ignore this message.\n\n'
-        f'You can reset your password by visiting <a href=\"localhost:8080/reset/{reset_token}\" target="_blank" rel="noreferrer noopener">tmeit.se/reset/{reset_token}</a>\n\n'
+        f'You can reset your password by visiting <a href=\"tmeit.se/reset/{reset_token}\" target="_blank" rel="noreferrer noopener">tmeit.se/reset/{reset_token}</a>\n\n'
         "XOXO,\n"
         "A fucking computer\n"
     )
@@ -31,7 +31,7 @@ async def send_password_reset_email(ctx: WorkerContext, email: str, reset_token:
     send_email(
         sending_user="tmeit",
         to_display_name=full_name,
-        to_email='1@test.com',#to_email=email,
+        to_email=email,
         subject=f"Password reset requested - TMEIT - {str(datetime.now(timezone.utc))[0:16]}",
         message_text=body,
         message_html=(email_header + convert_body_to_html(body) + '</body></html>'),
diff --git a/front/src/app/layouts/PasswordReset.js b/front/src/app/layouts/PasswordReset.js
index f9b2bbc..d338395 100644
--- a/front/src/app/layouts/PasswordReset.js
+++ b/front/src/app/layouts/PasswordReset.js
@@ -63,7 +63,8 @@ function PasswordReset({className}) {
             xhr.onload = function () {
             if(xhr.status === 200){
                 setErrorMessage(1);
-                navigate(0);
+                alert("Password has been reset!");
+                navigate("/");
             }
             else{
                 alert(`error: ${xhr.status}: ${xhr.statusText}`);