diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
index 37f1890..4324467 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/PersistenceContextFactory.java
@@ -34,7 +34,7 @@ public class PersistenceContextFactory {
         return emf.createEntityManager(SynchronizationType.UNSYNCHRONIZED);
     }
 
-    public void closeEntityManager(@Disposes EntityManager em) {
+    public void closeEntityManager(@Disposes @AccountPU EntityManager em) {
         if (LOGGER.isTraceEnabled()) {
             LOGGER.trace("closing entityManager");
         }
diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
index 6882eff..6111584 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java
@@ -1,9 +1,9 @@
 package de.muehlencord.shared.account.web.presentation;
 
-
 import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;
 import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+import de.muehlencord.shared.account.util.AccountPU;
 import java.io.Serializable;
 import javax.ejb.EJB;
 import javax.faces.application.FacesMessage;
@@ -25,11 +25,12 @@ public class UniqueApplicationRoleNameValidator implements Validator, Serializab
     private static final long serialVersionUID = 8165013107453616719L;
 
     @Inject
+    @AccountPU
     EntityManager em;
 
     @EJB
     ApplicationRoleControl applicationRoleControl;
-        
+
     @Override
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
         Object applicationObj = component.getAttributes().get("application");
diff --git a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java
index 3ca5320..5269134 100644
--- a/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java
+++ b/account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java
@@ -1,9 +1,9 @@
 package de.muehlencord.shared.account.web.presentation;
 
-
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
 import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+import de.muehlencord.shared.account.util.AccountPU;
 import java.io.Serializable;
 import javax.ejb.EJB;
 import javax.faces.application.FacesMessage;
@@ -28,6 +28,7 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
     private static final Logger LOGGER = LoggerFactory.getLogger(UniquePermissionNameValidator.class);
 
     @Inject
+    @AccountPU
     EntityManager em;
 
     @EJB
@@ -36,7 +37,7 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
     @Override
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
         Object applicationObj = component.getAttributes().get("application");
-            if ((applicationObj != null) && (applicationObj instanceof ApplicationEntity)) {
+        if ((applicationObj != null) && (applicationObj instanceof ApplicationEntity)) {
             ApplicationEntity application = (ApplicationEntity) applicationObj;
             if (value == null) {
                 throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission name must not be empty"));
@@ -45,7 +46,7 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
                 String permissionName = (String) value;
                 ApplicationPermissionEntity existingPermission = applicationPermissionControl.findPermissionByName(application, permissionName);
                 if (existingPermission != null) {
-                    throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission already exists")); 
+                    throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission already exists"));
                 }
             } else {
                 throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission name must be a string value"));