diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js
index be39851ab..bbf676e8a 100644
--- a/Server/controllers/authController.js
+++ b/Server/controllers/authController.js
@@ -161,7 +161,12 @@ const userEditController = async (req, res, next) => {
 
 const checkAdminController = async (req, res) => {
   try {
-    await req.db.checkAdmin(req, res);
+    const adminExists = await req.db.checkAdmin(req, res);
+    return res.status(200).json({
+      success: true,
+      msg: successMessages.AUTH_ADMIN_EXISTS,
+      data: adminExists,
+    });
   } catch (error) {
     error.service = SERVICE_NAME;
     next(error);
diff --git a/Server/db/MongoDB.js b/Server/db/MongoDB.js
index 0b7aa0c87..a789966d9 100644
--- a/Server/db/MongoDB.js
+++ b/Server/db/MongoDB.js
@@ -166,7 +166,10 @@ const resetPassword = async (req, res) => {
 const checkAdmin = async (req, res) => {
   try {
     const admin = await UserModel.findOne({ role: "admin" });
-    console.log(admin);
+    if (admin !== null) {
+      return true;
+    }
+    return false;
   } catch (error) {
     throw error;
   }
diff --git a/Server/utils/messages.js b/Server/utils/messages.js
index cb435757c..9ed03fdb6 100644
--- a/Server/utils/messages.js
+++ b/Server/utils/messages.js
@@ -56,6 +56,7 @@ const successMessages = {
   AUTH_CREATE_RECOVERY_TOKEN: "Recovery token created successfully",
   AUTH_VERIFY_RECOVERY_TOKEN: "Recovery token verified successfully",
   AUTH_RESET_PASSWORD: "Password reset successfully",
+  AUTH_ADMIN_CHECK: "Admin check completed successfully",
 
   // Check Controller
   CHECK_CREATE: "Check created successfully",
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index 4316939b4..64865a6c2 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -14,6 +14,7 @@ const registerValidation = joi.object({
   lastname: joi.string().required(),
   email: joi.string().email().required(),
   password: joi.string().min(8).required(),
+  role: joi.string().required(),
 });
 
 const editUserParamValidation = joi.object({
@@ -24,6 +25,7 @@ const editUserBodyValidation = joi.object({
   firstname: joi.string(),
   lastname: joi.string(),
   profilePicUrl: joi.string(),
+  role: joi.string(),
 });
 
 const recoveryValidation = joi.object({