diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
index ddadfff..4559fce 100644
--- a/src/auth/auth.controller.ts
+++ b/src/auth/auth.controller.ts
@@ -38,7 +38,7 @@ export class AuthController {
       });
     }
 
-    return { statusCode: 200, message: "Logged-In Successfully", email: k.email }
+    return { statusCode: 200, message: "Logged-In Successfully", email: k.email, applicationName: k.applicationName }
   }
 
   // @UseGuards(RegisterGuard)
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index a3596aa..5dc56b9 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -270,9 +270,9 @@ export class AuthService {
 
       if (Array.isArray(emailVerifyResponse) && !emailVerifyResponse[0].ERRORMESG) {
         switch (emailVerifyResponse[0].SOURCE) {
-          case "USCIB": ROLE = 'ua'; break;
-          case "SP": ROLE = 'sa'; break;
-          case "CLIENT": ROLE = 'ca'; break;
+          case "USCIB": ROLE = 'USCIB'; break;
+          case "SP": ROLE = 'SP'; break;
+          case "CLIENT": ROLE = 'CLIENT'; break;
         }
       }
 
@@ -299,7 +299,7 @@ export class AuthService {
         let tokens = await this.getTokenFromRefreshToken(req);
         const decoded = jwt.decode(access_token, { complete: true });
         const email: any = (decoded && typeof decoded === 'object') ? (decoded as any).payload?.email : undefined;
-        return { ...tokens, email }
+        return { ...tokens, email, ApplicationName: ROLE }
 
       }
 
@@ -307,7 +307,7 @@ export class AuthService {
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       });
 
-      let k = { ...response.data, email: username };
+      let k = { ...response.data, email: username, applicationName: ROLE };
 
       return k;
     } catch (error) {
diff --git a/src/oracle/user-maintenance/user-maintenance.service.ts b/src/oracle/user-maintenance/user-maintenance.service.ts
index 0541a1f..4b76a1b 100644
--- a/src/oracle/user-maintenance/user-maintenance.service.ts
+++ b/src/oracle/user-maintenance/user-maintenance.service.ts
@@ -395,7 +395,7 @@ export class UserMaintenanceService {
             const mailRes = await this.authService.sendMail({ P_TO: body.P_USERID, P_MAIL_TYPE: MailTypeDTO.REGISTER_CLIENT })
 
             if (mailRes.statusCode !== 200) {
-                return new InternalServerException();
+                throw new InternalServerException();
             }
 
             return { statusCode: 201, message: "Client registration initiated successfully", ...fres[0] };