diff --git a/lms/lms/api.py b/lms/lms/api.py
index 3d38797f..2d567327 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -470,16 +470,22 @@ def get_assigned_badges(member):
 
 @frappe.whitelist()
 def get_all_users():
-	frappe.only_for(["Moderator", "Course Creator", "Batch Evaluator"])
-	users = frappe.get_all(
-		"User",
-		{
-			"enabled": 1,
-		},
-		["name", "full_name", "user_image"],
-	)
+    frappe.only_for(["Moderator", "Course Creator", "Batch Evaluator"])
+    users = frappe.get_all(
+        "User",
+        {"enabled": 1},
+        ["name", "full_name", "user_image", "email"]
+    )
 
-	return {user.name: user for user in users}
+    for user in users:
+        roles = frappe.get_all(
+            "Has Role",
+            filters={"parent": user.name},
+            fields=["role"]
+        )
+        user["roles"] = [role["role"] for role in roles]
+
+    return users
 
 
 @frappe.whitelist()