diff --git a/controllers/routineController.js b/controllers/routineController.js
index 6b72325..bff653b 100644
--- a/controllers/routineController.js
+++ b/controllers/routineController.js
@@ -4,6 +4,7 @@ var User = require('../models/User');
 var CalendarList = require('../models/CalendarList');
 var mongoose = require('mongoose');
 var findPos = require('../utils/arrayUtil');
+var { sendEmail } = require('../utils/email/sendEmail');
 
 // Fetch user's own routines 
 exports.getMyRoutines = async (req, res) => {
@@ -191,6 +192,7 @@ exports.editRoutine = async (req, res) => {
  */
 var addPointsHelper = (user, levelPoints) => {
     var originalPoints = user.points; 
+    var originalLevel = user.level; 
     user.points = (user.points + 100) % levelPoints; 
     user.level = originalPoints >= user.points 
                     ? ( user.level === 20 
@@ -198,6 +200,13 @@ var addPointsHelper = (user, levelPoints) => {
                         : ++user.level 
                       )
                     : user.level; 
+    if (user.level > originalLevel) {
+        sendEmail(
+            user.email, 
+            "[FUNFIT] NEW LEVEL UNLOCKED", 
+            `Congratulations! You have reached level ${user.level}`
+        );
+    }
 }
 
 // Add a day to DaysFollow after completing a routine 
diff --git a/controllers/userController.js b/controllers/userController.js
index a3e6cf0..997f414 100644
--- a/controllers/userController.js
+++ b/controllers/userController.js
@@ -1,6 +1,5 @@
 var User = require('../models/User'); 
 var CalendarList = require('../models/CalendarList');
-// var DaysFollow = require('../models/DaysFollow');
 var bcrypt = require('bcryptjs/dist/bcrypt');
 var jwt = require('jsonwebtoken');
 var RefreshToken = require('../models/RefreshToken'); 
@@ -169,7 +168,7 @@ exports.forgotPassword = async (req, res) => {
 
         sendEmail(
             user.email, 
-            "Password Reset Request", 
+            "[FUNFIT] PASSWORD RESET REQUEST", 
             "Hi " + user.name + ", you have requested to reset your password on Funfit. Please enter the following code to reset password: " + code + "." 
         );
         res.status(200).send({userId: user._id}); 
@@ -236,7 +235,7 @@ exports.passwordReset = async (req, res) => {
 
     sendEmail(
         user.email, 
-        "Password Reset Successfully", 
+        "[FUNFIT] PASSWORD RESET SUCCESSFULLY", 
         "Hi " + user.name + ", you have successfully reset your password on Funfit"
     ); 
 
@@ -293,19 +292,6 @@ exports.getLevel = async (req, res) => {
     }
 }
 
-// // Fetch days completing any routines and reminders 
-// exports.getDaysFollow = async (req, res) => {
-//     try {
-//         const item = await DaysFollow.findOne({ userId: req.user.id }, 'daysFollow');
-//         if (!item) {
-//             return res.status(200).send("You haven't completed any routine yet")
-//         }
-//         res.status(200).send(item.daysFollow);  
-//     } catch (err) {
-//         res.status(500).send(err.message);
-//     }
-// }
-
 // Fetch days completing any routines and reminders 
 exports.getCalendarList = async (req, res) => {
     try {
@@ -341,16 +327,3 @@ exports.getCalendarList = async (req, res) => {
 //         res.status(500).send(err.message);
 //     }
 // }
-
-// // Fetch list of reminders to do routines 
-// exports.getReminderList = async (req, res) => {
-//     try {
-//         const item = await ReminderList.findOne({ userId: req.user.id });
-//         if (!item) {
-//             return res.status(200).send("No reminder added yet")
-//         }
-//         res.status(200).send(item.reminderList); 
-//     } catch (err) {
-//         res.status(500).send(err.message);
-//     }
-// }
\ No newline at end of file
diff --git a/utils/chatUtil.js b/utils/chatUtil.js
index d15a2af..04a62b0 100644
--- a/utils/chatUtil.js
+++ b/utils/chatUtil.js
@@ -48,7 +48,7 @@ exports.chatConfig = (io) => {
 
                 sendEmail(
                     receiver.email, 
-                    "New message in Funfit", 
+                    "[FUNFIT] NEW MESSAGE TO YOU", 
                     `Hi, you received a new message from ${sender.name}`
                 );
             } catch (err) {