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..3236b10 100644
--- a/src/main/java/com/olympus/hermione/security/services/JwtService.java
+++ b/src/main/java/com/olympus/hermione/security/services/JwtService.java
@@ -42,18 +42,17 @@ public class JwtService {
         Date expiry = new Date(now.getTime() + EXPIRATION_MS);
 
        
-        String email =azureJwt.getClaim("email");
-
+        String email = azureJwt.getClaim("email");
+        String username = email.split("@")[0];
         
         return Jwts.builder()
-            .setSubject(email)
+            .setSubject(username)
             .setIssuedAt(new Date())
             .setExpiration(expiry)
             .signWith(getSignKey(), SignatureAlgorithm.HS512)
             //.signWith(SignatureAlgorithm.HS512, SECRET)
             .compact();
 
-
     }
 
     public String generateInternalTokenFromUsername(Authentication authentication) {