diff --git a/src/recommenderapp/static/script.js b/src/recommenderapp/static/script.js
index 9c24a404f..b410dc5b2 100644
--- a/src/recommenderapp/static/script.js
+++ b/src/recommenderapp/static/script.js
@@ -170,9 +170,19 @@ $(document).ready(function () {
   });
 
   $("#notifyButton").click(function () {
-    data = JSON.parse(localStorage.getItem("fbData"));
+    var data = JSON.parse(localStorage.getItem("fbData"));
+  
+    if (!data) {
+      alert("No feedback data found. Please provide feedback.");
+      return;
+    }
+  
     var emailString = $("#emailField").val();
     data.email = emailString;
+  
+    // Remove the "emailSent" flag to allow sending the email again
+    localStorage.removeItem("emailSent");
+  
     $.ajax({
       type: "POST",
       url: "/sendMail",
@@ -182,7 +192,13 @@ $(document).ready(function () {
       cache: false,
       data: JSON.stringify(data),
       success: function (response) {
-        localStorage.removeItem("fbData");
+        // localStorage.removeItem("fbData");
+        $("#emailSentSuccess").show();
+        // Hide the success message after 5 seconds (5000 milliseconds)
+        setTimeout(function () {
+          $("#emailSentSuccess").fadeOut("slow");
+        }, 2000);
+        console.log("Email sent successfully!")
         console.log(response);
       },
       error: function (error) {
@@ -191,4 +207,5 @@ $(document).ready(function () {
       },
     });
   });
+  
 });
diff --git a/src/recommenderapp/templates/success.html b/src/recommenderapp/templates/success.html
index 94c48ad91..9993a69d6 100644
--- a/src/recommenderapp/templates/success.html
+++ b/src/recommenderapp/templates/success.html
@@ -65,6 +65,15 @@ <h1>Thanks!! Your response was stored.</h1>
         </form>
       </div>
     </div>
+
+    <!-- Add the "Email sent successfully!" message here -->
+    <div
+      id="emailSentSuccess"
+      style="display: none; position: absolute; top: 80px; left: 50%; transform: translateX(-50%);"
+    >
+      <h3>Email sent successfully!</h3>
+    </div>
+
   </body>
   <script
     src="https://code.jquery.com/jquery-3.5.1.min.js"