diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml
index cded907..a60e694 100644
--- a/mujina-common/pom.xml
+++ b/mujina-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.3</version>
+        <version>8.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml
index dff06f6..95d403f 100644
--- a/mujina-idp/pom.xml
+++ b/mujina-idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.3</version>
+        <version>8.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/mujina-idp/src/main/java/mujina/idp/SsoController.java b/mujina-idp/src/main/java/mujina/idp/SsoController.java
index 1363dd3..557ee78 100644
--- a/mujina-idp/src/main/java/mujina/idp/SsoController.java
+++ b/mujina-idp/src/main/java/mujina/idp/SsoController.java
@@ -107,7 +107,9 @@ private List<SAMLAttribute> attributes(Authentication authentication) {
         Map<String, List<String>> replacements = new HashMap<>();
         String mail = String.format("%s@%s",
                 uid.replaceAll("[^a-zA-Z0-9]", ""),
-                "example.com");
+                "example.com")
+                .toLowerCase();
+        String givenName = uid.substring(0, 1).toUpperCase() + uid.substring(1);
         result.keySet().forEach(key -> {
             String standardValue = standardAttributes.get(key);
             List<String> resultValues = result.get(key);
@@ -117,10 +119,10 @@ private List<SAMLAttribute> attributes(Authentication authentication) {
                 switch (key) {
                     case "urn:mace:dir:attribute-def:cn":
                     case "urn:mace:dir:attribute-def:displayName":
-                        replacements.put(key, List.of(uid + " Doe"));
+                        replacements.put(key, List.of(givenName + " Doe"));
                         break;
                     case "urn:mace:dir:attribute-def:givenName":
-                        replacements.put(key, List.of(uid));
+                        replacements.put(key, List.of(givenName));
                         break;
                     case "urn:mace:dir:attribute-def:mail":
                     case "urn:mace:dir:attribute-def:eduPersonPrincipalName":
diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml
index 90009e5..7121919 100644
--- a/mujina-sp/pom.xml
+++ b/mujina-sp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.3</version>
+        <version>8.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 51f93f6..13d7d97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>mujina</artifactId>
-  <version>8.0.3</version>
+  <version>8.0.4</version>
   <packaging>pom</packaging>
 
   <parent>