diff --git a/src/components/AddLeanerModal.tsx b/src/components/AddLeanerModal.tsx
index 368cb8ff..70335590 100644
--- a/src/components/AddLeanerModal.tsx
+++ b/src/components/AddLeanerModal.tsx
@@ -280,7 +280,7 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
             if (creatorName && userEmail) {
               sendEmail(
                 creatorName,
-                username,
+                apiBody['username'],
                 password,
                 userEmail,
                 apiBody['firstName']
@@ -309,17 +309,17 @@ const AddLearnerModal: React.FC<AddLearnerModalProps> = ({
 
  
   const handleChange = (event: IChangeEvent<any>) => {
-    if (!isEditModal) {
-      const { firstName, lastName } = event.formData;
+    // if (!isEditModal) {
+    //   const { firstName, lastName } = event.formData;
   
-      if (firstName && lastName) {
-        event.formData.username = firstName + lastName;
-      } else {
-        event.formData.username = "";
-      }
-      setCustomFormData({ ...event.formData });
+    //   if (firstName && lastName) {
+    //     event.formData.username = firstName + lastName;
+    //   } else {
+    //     event.formData.username = "";
+    //   }
+    //   setCustomFormData({ ...event.formData });
 
-    }
+    // }
   
   };
   
diff --git a/src/pages/login.tsx b/src/pages/login.tsx
index e201a2cb..32f62288 100644
--- a/src/pages/login.tsx
+++ b/src/pages/login.tsx
@@ -280,7 +280,7 @@ const LoginPage = () => {
 
             localStorage.setItem('role', userResponse?.tenantData[0]?.roleName);
             localStorage.setItem('userEmail', userResponse?.email);
-            localStorage.setItem('userName', userResponse?.name);
+            localStorage.setItem('userName', userResponse?.firstName);
             localStorage.setItem('userIdName', userResponse?.username);
             localStorage.setItem(
               'temporaryPassword',