diff --git a/myconext-server/src/main/java/myconext/security/GuestIdpAuthenticationRequestFilter.java b/myconext-server/src/main/java/myconext/security/GuestIdpAuthenticationRequestFilter.java
index acb89ec4..08b2e135 100644
--- a/myconext-server/src/main/java/myconext/security/GuestIdpAuthenticationRequestFilter.java
+++ b/myconext-server/src/main/java/myconext/security/GuestIdpAuthenticationRequestFilter.java
@@ -713,7 +713,11 @@ protected List<SAMLAttribute> attributes(User user, String requesterEntityId) {
         String givenName = user.getGivenName();
         String familyName = user.getFamilyName();
         String chosenName = user.getChosenName();
-
+        if (!StringUtils.hasText(chosenName)) {
+            chosenName = givenName;
+            //Migrate at JIT as only users with linked-accounts were migrated in myconext.mongo.Migrations#migrateUsers
+            user.setChosenName(chosenName);
+        }
         String displayName = String.format("%s %s", chosenName, familyName);
         String commonName = String.format("%s %s", givenName, familyName);
         String eppn = user.getEduPersonPrincipalName();