diff --git a/frontend/src/components/Auth/ForgotPasswordForm.tsx b/frontend/src/components/Auth/ForgotPasswordForm.tsx
index baf718c..2545272 100644
--- a/frontend/src/components/Auth/ForgotPasswordForm.tsx
+++ b/frontend/src/components/Auth/ForgotPasswordForm.tsx
@@ -53,7 +53,7 @@ const ForgotPasswordForm: React.FC<SubmitProps> = ({ onSubmit }) => {
         if (!response.ok) {
           const data = await response.json();
           throw new Error(
-            data.message || "An error has occurred while resetting"
+            data.error || "An error has occurred while resetting"
           );
         } else {
           confirmPasswordReset();
diff --git a/web_server/blueprints/user.py b/web_server/blueprints/user.py
index fc0f7ce..584bb3b 100644
--- a/web_server/blueprints/user.py
+++ b/web_server/blueprints/user.py
@@ -3,7 +3,7 @@ from utils.user_utils import *
 from utils.auth import *
 from utils.utils import get_category_id
 from blueprints.middleware import login_required
-from utils.email import send_email, forgot_password_body, newsletter_conf, remove_from_newsletter
+from utils.email import send_email, forgot_password_body, newsletter_conf, remove_from_newsletter, email_exists
 from utils.path_manager import PathManager
 from celery_tasks.streaming import convert_image_to_png
 import redis
@@ -195,8 +195,11 @@ def user_forgot_password(email):
     """
     Initializes the function to handle password reset
     """
-    send_email(email, lambda: forgot_password_body(email))
-    return email
+    exists = email_exists(email)
+    if(exists):
+        send_email(email, lambda: forgot_password_body(email))
+        return email
+    return jsonify({"error":"email not found"}), 404
 
 @user_bp.route("/send_newsletter/<string:email>", methods=["POST"])
 def send_newsletter(email):
diff --git a/web_server/utils/email.py b/web_server/utils/email.py
index ab4698b..73543f3 100644
--- a/web_server/utils/email.py
+++ b/web_server/utils/email.py
@@ -201,4 +201,15 @@ def remove_from_newsletter(email):
         db.execute("""
                 DELETE FROM newsletter
                 WHERE email = ?;
-                """, (email,))
\ No newline at end of file
+                """, (email,))
+        
+def email_exists(email):
+    """
+    Returns whether email exists within database
+    """
+    with Database() as db:
+        data = db.fetchone("""
+                SELECT * FROM users
+                WHERE email = ?         
+        """, (email,))
+    return bool(data)
\ No newline at end of file