diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
index 24bae7f7d..a528432d1 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/ClearUserPasswordService.java
@@ -45,20 +45,19 @@ public class ClearUserPasswordService extends AbstractService<PrivilegeUserNameA
 		try (StrolchTransaction tx = openArgOrUserTx(arg, PrivilegeHandler.PRIVILEGE_SET_USER_PASSWORD)) {
 			tx.setSuppressAudits(true);
 
-			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer()
-					.getPrivilegeHandler();
+			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer().getPrivilegeHandler();
 			PrivilegeHandler privilegeHandler = strolchPrivilegeHandler.getPrivilegeHandler();
 			privilegeHandler.setUserPassword(getCertificate(), arg.username, null);
 
 			// only persist if not setting own password
 			if (!getCertificate().getUsername().equals(arg.username) && getPrivilegeContext().getPrivilegeNames()
 					.contains(PrivilegeHandler.PRIVILEGE_ACTION_PERSIST)) {
-				privilegeHandler.persist(getCertificate());
+				if (privilegeHandler.isPersistOnUserDataChanged())
+					privilegeHandler.persist(getCertificate());
 			}
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							arg.username);
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, arg.username);
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
index fad7f87c0..c1c136e01 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddRoleToUserService.java
@@ -51,11 +51,11 @@ public class PrivilegeAddRoleToUserService
 			tx.setSuppressAudits(true);
 
 			user = privilegeHandler.addRoleToUser(getCertificate(), arg.username, arg.rolename);
-			privilegeHandler.persist(getCertificate());
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							user.getUsername());
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, user.getUsername());
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
index 4dfec3aaa..ec33826e2 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUserCommand.java
@@ -54,7 +54,8 @@ public class PrivilegeAddUserCommand extends Command {
 	public void doCommand() {
 		PrivilegeHandler privilegeHandler = getContainer().getPrivilegeHandler().getPrivilegeHandler();
 		this.userOut = privilegeHandler.addUser(this.cert, this.userIn, null);
-		privilegeHandler.persist(this.cert);
+		if (privilegeHandler.isPersistOnUserDataChanged())
+			privilegeHandler.persist(this.cert);
 		writeAudit();
 	}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
index 0fb3c5c6a..4a615537d 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeAddUsersCommand.java
@@ -46,7 +46,8 @@ public class PrivilegeAddUsersCommand extends Command {
 	public void doCommand() {
 		PrivilegeHandler privilegeHandler = getContainer().getPrivilegeHandler().getPrivilegeHandler();
 		privilegeHandler.addOrUpdateUsers(this.cert, this.usersIn);
-		privilegeHandler.persist(this.cert);
+		if (privilegeHandler.isPersistOnUserDataChanged())
+			privilegeHandler.persist(this.cert);
 		writeAudits();
 	}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
index 4df8a0ec3..f291b9884 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveRoleFromUserService.java
@@ -50,11 +50,11 @@ public class PrivilegeRemoveRoleFromUserService
 			tx.setSuppressAudits(true);
 
 			user = privilegeHandler.removeRoleFromUser(getCertificate(), arg.username, arg.rolename);
-			privilegeHandler.persist(getCertificate());
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							user.getUsername());
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, user.getUsername());
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
index e3b0ca996..4435fbd8a 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeRemoveUserCommand.java
@@ -34,7 +34,8 @@ public class PrivilegeRemoveUserCommand extends Command {
 		PrivilegeHandler privilegeHandler = strolchPrivilegeHandler.getPrivilegeHandler();
 
 		privilegeHandler.removeUser(tx().getCertificate(), this.username);
-		privilegeHandler.persist(tx().getCertificate());
+		if (privilegeHandler.isPersistOnUserDataChanged())
+			privilegeHandler.persist(tx().getCertificate());
 
 		Audit audit = tx().auditFrom(AccessType.DELETE, PRIVILEGE, USER, this.username);
 		tx().getAuditTrail().add(tx(), audit);
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
index aa8c2a8a7..2c348f16d 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserLocaleService.java
@@ -51,11 +51,11 @@ public class PrivilegeSetUserLocaleService
 			tx.setSuppressAudits(true);
 
 			user = privilegeHandler.setUserLocale(getCertificate(), arg.username, arg.locale);
-			privilegeHandler.persist(getCertificate());
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							user.getUsername());
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, user.getUsername());
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
index f6a2f7957..c654c63a8 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordService.java
@@ -45,20 +45,19 @@ public class PrivilegeSetUserPasswordService extends AbstractService<PrivilegeSe
 		try (StrolchTransaction tx = openArgOrUserTx(arg, PrivilegeHandler.PRIVILEGE_SET_USER_PASSWORD)) {
 			tx.setSuppressAudits(true);
 
-			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer()
-					.getPrivilegeHandler();
+			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer().getPrivilegeHandler();
 			PrivilegeHandler privilegeHandler = strolchPrivilegeHandler.getPrivilegeHandler();
 			privilegeHandler.setUserPassword(getCertificate(), arg.username, arg.password);
 
 			// only persist if not setting own password
 			if (!getCertificate().getUsername().equals(arg.username) && getPrivilegeContext().getPrivilegeNames()
 					.contains(PrivilegeHandler.PRIVILEGE_ACTION_PERSIST)) {
-				privilegeHandler.persist(getCertificate());
+				if (privilegeHandler.isPersistOnUserDataChanged())
+					privilegeHandler.persist(getCertificate());
 			}
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							arg.username);
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, arg.username);
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
index 76a48b371..7880b7bb2 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserPasswordStateService.java
@@ -56,10 +56,11 @@ public class PrivilegeSetUserPasswordStateService extends AbstractService<String
 		try (StrolchTransaction tx = openArgOrUserTx(arg, PRIVILEGE_SET_USER_PASSWORD)) {
 			tx.setSuppressAudits(true);
 
-			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer()
-					.getPrivilegeHandler();
+			li.strolch.runtime.privilege.PrivilegeHandler strolchPrivilegeHandler = getContainer().getPrivilegeHandler();
 			PrivilegeHandler privilegeHandler = strolchPrivilegeHandler.getPrivilegeHandler();
 			privilegeHandler.requirePasswordChange(getCertificate(), username);
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
 			Audit audit = tx.auditFrom(AccessType.UPDATE, PRIVILEGE, USER, username);
 			tx.getAuditTrail().add(tx, audit);
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
index b6fbb7c8b..ccd516b1d 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeSetUserStateService.java
@@ -50,11 +50,11 @@ public class PrivilegeSetUserStateService extends AbstractService<PrivilegeSetUs
 			tx.setSuppressAudits(true);
 
 			user = privilegeHandler.setUserState(getCertificate(), arg.username, arg.userState);
-			privilegeHandler.persist(getCertificate());
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							user.getUsername());
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, user.getUsername());
 			tx.getAuditTrail().add(tx, audit);
 		}
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
index 9797a228e..48d62a0e3 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserRolesService.java
@@ -80,6 +80,10 @@ public class PrivilegeUpdateUserRolesService extends AbstractService<JsonService
 			}
 
 			if (changed) {
+
+				if (privilegeHandler.isPersistOnUserDataChanged())
+					privilegeHandler.persist(getCertificate());
+
 				Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
 						StrolchPrivilegeConstants.USER, user.getUsername());
 				tx.getAuditTrail().add(tx, audit);
diff --git a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
index bdd8da872..55255da06 100644
--- a/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
+++ b/li.strolch.service/src/main/java/li/strolch/service/privilege/users/PrivilegeUpdateUserService.java
@@ -50,11 +50,11 @@ public class PrivilegeUpdateUserService extends AbstractService<PrivilegeUserArg
 			tx.setSuppressAudits(true);
 
 			user = privilegeHandler.updateUser(getCertificate(), arg.user);
-			privilegeHandler.persist(getCertificate());
+			if (privilegeHandler.isPersistOnUserDataChanged())
+				privilegeHandler.persist(getCertificate());
 
-			Audit audit = tx
-					.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE, StrolchPrivilegeConstants.USER,
-							user.getUsername());
+			Audit audit = tx.auditFrom(AccessType.UPDATE, StrolchPrivilegeConstants.PRIVILEGE,
+					StrolchPrivilegeConstants.USER, user.getUsername());
 			tx.getAuditTrail().add(tx, audit);
 		}