diff --git a/backend/src/test/java/ch/puzzle/okr/service/persistence/UnitPersistenceServiceIT.java b/backend/src/test/java/ch/puzzle/okr/service/persistence/UnitPersistenceServiceIT.java
index 37799fcc78..9d5feb36bd 100644
--- a/backend/src/test/java/ch/puzzle/okr/service/persistence/UnitPersistenceServiceIT.java
+++ b/backend/src/test/java/ch/puzzle/okr/service/persistence/UnitPersistenceServiceIT.java
@@ -36,7 +36,7 @@ void saveShouldSaveUserWithEmptyUserTeamList() {
 
         // assert
         assertNotNull(createdUnit.getId());
-        assertUser("Mocked user first name for test", "Mocked user last name for test", "gl@gl.com", createdUnit.getCreatedBy());
+        assertUser("mocked user first name for test", "mocked user last name for test", "gl@gl.com", createdUnit.getCreatedBy());
         unitPersistenceService.deleteById(createdUnit.getId());
     }
 
diff --git a/backend/src/test/java/ch/puzzle/okr/test/WithMockAuthUserSecurityContextFactory.java b/backend/src/test/java/ch/puzzle/okr/test/WithMockAuthUserSecurityContextFactory.java
index a95b47d7ee..29801829d6 100644
--- a/backend/src/test/java/ch/puzzle/okr/test/WithMockAuthUserSecurityContextFactory.java
+++ b/backend/src/test/java/ch/puzzle/okr/test/WithMockAuthUserSecurityContextFactory.java
@@ -25,16 +25,16 @@ public SecurityContext createSecurityContext(WithMockAuthUser annotation) {
         User  user = User.Builder
                 .builder()
                 .withEmail(annotation.email())
-                .withFirstName("Mocked user first name for test")
+                .withFirstName("mocked user first name for test")
                 .withLastName("mocked user last name for test")
                 .build();
-//        Optional<User> byEmail = this.userPersistenceService.findByEmail(annotation.email());
-//        byEmail.ifPresentOrElse(
-//                (u) -> {
-//                   user.setFirstName(u.getFirstName());
-//                   user.setLastName(u.getLastName());
-//                }, ()->{}
-//        );
+        Optional<User> byEmail = this.userPersistenceService.findByEmail(annotation.email());
+        byEmail.ifPresentOrElse(
+                (u) -> {
+                   user.setFirstName(u.getFirstName());
+                   user.setLastName(u.getLastName());
+                }, ()->{}
+        );
         context.setAuthentication(new JwtAuthenticationToken(TestHelper.mockJwtToken(user), List.of()));
         return context;
     }