diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
index b1c284e7d9d7612e7ed2b6671bab53f6bd19a46e..7ee93a6f94b87116a653ca5150c7f704ee4c5f45 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
@@ -117,7 +117,7 @@ public class DomainAdminController {
         return domainRO;
     }
 
-    @PreAuthorize("@smpAuthorizationService.systemAdministrator || @smpAuthorizationService.isCurrentlyLoggedIn(#userId)")
+    @PreAuthorize("@smpAuthorizationService.isCurrentlyLoggedIn(#userId) and @smpAuthorizationService.systemAdministrator")
     @PutMapping(value = "/{user-id}/sml-register/{domain-code}")
     public SMLIntegrationResult registerDomainAndParticipants(@PathVariable("user-id") String userId,
                                                               @PathVariable("domain-code") String domainCode
@@ -136,7 +136,7 @@ public class DomainAdminController {
     }
 
 
-    @PreAuthorize("@smpAuthorizationService.systemAdministrator || @smpAuthorizationService.isCurrentlyLoggedIn(#userId)")
+    @PreAuthorize("@smpAuthorizationService.isCurrentlyLoggedIn(#userId) and @smpAuthorizationService.systemAdministrator")
     @PutMapping(value = "/{user-id}/sml-unregister/{domain-code}")
     public SMLIntegrationResult unregisterDomainAndParticipants(@PathVariable("user-id") String userId,
                                                                 @PathVariable("domain-code") String domainCode) {