diff --git a/controllers/authController.go b/controllers/authController.go
index 8211178..7e98b59 100644
--- a/controllers/authController.go
+++ b/controllers/authController.go
@@ -27,6 +27,27 @@ const SecretKey = "secret"
 var systemEmail string = os.Getenv("SYSTEM_EMAIL")
 var systemPassword string = os.Getenv("SYSTEM_PASSWORD")
 
+func AuthAdmin(c *fiber.Ctx) bool {
+	cookie := c.Cookies("jwt")
+
+	token, err := jwt.ParseWithClaims(cookie, &jwt.StandardClaims{}, func(token *jwt.Token) (interface{}, error) {
+		return []byte(SecretKey), nil
+	})
+	if err != nil {
+		return false
+	}
+
+	claims := token.Claims.(*jwt.StandardClaims)
+
+	var admin models.Admin
+	findErr := adminCollection.FindOne(context.TODO(), bson.M{"aid": claims.Issuer}).Decode(&admin)
+	if findErr != nil {
+		return false
+	}
+
+	return true
+}
+
 func Enroll(c *fiber.Ctx) error {
 	var data map[string]string
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
@@ -40,22 +61,12 @@ func Enroll(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -98,7 +109,7 @@ func Enroll(c *fiber.Ctx) error {
 
 	auth := smtp.PlainAuth("", systemEmail, systemPassword, smtpHost)
 
-	err = smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{student.Email}, message)
+	err := smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{student.Email}, message)
 	if err != nil {
 		cancel()
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -151,22 +162,12 @@ func RegisterTeacher(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -198,7 +199,7 @@ func RegisterTeacher(c *fiber.Ctx) error {
 
 	auth := smtp.PlainAuth("", systemEmail, systemPassword, smtpHost)
 
-	err = smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{teacher.Email}, message)
+	err := smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{teacher.Email}, message)
 	if err != nil {
 		cancel()
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -253,22 +254,12 @@ func CreateAdmin(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var checkadmin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&checkadmin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -298,7 +289,7 @@ func CreateAdmin(c *fiber.Ctx) error {
 
 	auth := smtp.PlainAuth("", systemEmail, systemPassword, smtpHost)
 
-	err = smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{admin.Email}, message)
+	err := smtp.SendMail(smtpHost+":"+smtpPort, auth, systemEmail, []string{admin.Email}, message)
 	if err != nil {
 		cancel()
 		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
@@ -670,22 +661,12 @@ func CreateContact(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
diff --git a/controllers/updateController.go b/controllers/updateController.go
index 9cc4c4c..043e41b 100644
--- a/controllers/updateController.go
+++ b/controllers/updateController.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"context"
-	"school-management/models"
 	"time"
 
 	"github.com/gofiber/fiber/v2"
@@ -23,22 +22,12 @@ func UpdateStudentName(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -97,22 +86,12 @@ func UpdateStudentGradeLevel(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authorized admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -168,13 +147,12 @@ func UpdateStudentHomeroom(c *fiber.Ctx) error {
 		})
 	}
 
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}
 
@@ -314,22 +292,12 @@ func UpdateTeacherName(c *fiber.Ctx) error {
 		})
 	}
 
-	// Check if admin sent request
-	if data["aid"] == "" {
+	// Ensure Authenticated admin sent request
+	if !AuthAdmin(c) {
 		cancel()
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"success": false,
-			"message": "admin id required",
-		})
-	}
-
-	var admin models.Admin
-	err := adminCollection.FindOne(ctx, bson.M{"aid": data["aid"]}).Decode(&admin)
-	if err != nil {
-		cancel()
-		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-			"success": false,
-			"message": "invalid admin id",
+			"message": "Unauthorized: only an admin can perform this action",
 		})
 	}