diff --git a/src/org/openbravo/dal/security/SecurityChecker.java b/src/org/openbravo/dal/security/SecurityChecker.java
--- a/src/org/openbravo/dal/security/SecurityChecker.java
+++ b/src/org/openbravo/dal/security/SecurityChecker.java
@@ -132,7 +132,7 @@
     final Entity entity = ((BaseOBObject) obj).getEntity();
     if ((!obContext.isInAdministratorMode() || obContext.doOrgClientAccessCheck())
         && clientId.length() > 0) {
-      if (obj instanceof ClientEnabled) {
+      if (obj instanceof ClientEnabled || obj instanceof Client) {
         if (!obContext.getCurrentClient().getId().equals(clientId)) {
           // TODO: maybe move rollback to exception throwing
           SessionHandler.getInstance().setDoRollback(true);