diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
index 9109f5abbf27362b36a1a52a37a47a3d055f01d4..6d978c7453e18ae504b7ad1fa86de61724a1d168 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
@@ -48,9 +48,6 @@ public class DBUserToUserROConverter implements Converter<DBUser, UserRO> {
         if (!credentials.isEmpty()) {
             // expected only one username/password
             DBCredential credential = credentials.get(0);
-            target.setPasswordExpired(credential.getExpireOn() == null || OffsetDateTime.now().isAfter(credential.getExpireOn()));
-
-
             target.setPasswordUpdatedOn(credential.getChangedOn());
             target.setPasswordExpireOn(credential.getExpireOn());
             target.setPasswordExpired(isCredentialExpired(credential));
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
index f88ad1bff9ef8772913decbdd764eec66718a253..c51451d93eff8115ed9394ead905f4c3061349c9 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIntegrationTest.java
@@ -66,7 +66,7 @@ public class UserResourceIntegrationTest {
     @Test
     public void testUpdateCurrentUserOK() throws Exception {
         // login
-        MockHttpSession session = loginWithUserGroupAdmin(mvc);
+        MockHttpSession session = loginWithSystemAdmin(mvc);
         // when update data
         UserRO userRO = getLoggedUserData(mvc, session);
         userRO.setActive(!userRO.isActive());
@@ -85,7 +85,7 @@ public class UserResourceIntegrationTest {
 
         // given when - log as SMP admin
         // then change values and list uses for changed value
-        MockHttpSession session = loginWithUserGroupAdmin(mvc);
+        MockHttpSession session = loginWithSystemAdmin(mvc);
         UserRO userRO = getLoggedUserData(mvc, session);
         assertNotNull(userRO);
         // when
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
index 91efdfe4ef84c7fbe00f080a9b3bca220e7cfd2a..005dda669394900f0612315c4aef0ffea3a829d9 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminResourceIntegrationTest.java
@@ -116,7 +116,7 @@ public class TruststoreAdminResourceIntegrationTest {
     @Test
     public void validateCertificateIdWithEmailSerialNumberInSubjectCertIdTest() throws Exception {
         // login
-        MockHttpSession session = loginWithUserGroupAdmin(mvc);
+        MockHttpSession session = loginWithSystemAdmin(mvc);
         // when update data
         UserRO userRO = getLoggedUserData(mvc, session);