diff --git a/src/main/java/com/olympus/hermione/security/services/JwtService.java b/src/main/java/com/olympus/hermione/security/services/JwtService.java
index ba3eb9c..6632fda 100644
--- a/src/main/java/com/olympus/hermione/security/services/JwtService.java
+++ b/src/main/java/com/olympus/hermione/security/services/JwtService.java
@@ -41,12 +41,20 @@ public class JwtService {
         Date now = new Date();
         Date expiry = new Date(now.getTime() + EXPIRATION_MS);
 
-       
-        String email =azureJwt.getClaim("email");
-
+        String username="";
+        String email = azureJwt.getClaim("email");
+        String username_claim =  azureJwt.getClaim("username");
+        String unique_name = azureJwt.getClaim("unique_name");
         
+        if(username_claim == null){
+            username = unique_name;
+        }
+
+        if ( username.contains("@") ){
+            username = username.split("@")[0];
+        }
         return Jwts.builder()
-            .setSubject(email)
+            .setSubject(username)
             .setIssuedAt(new Date())
             .setExpiration(expiry)
             .signWith(getSignKey(), SignatureAlgorithm.HS512)