diff --git a/modules/Users/actions/Save.php b/modules/Users/actions/Save.php
index 404a530b5b0b9328b41f6843b90f844591da7512..fba81bfc426dab20883bb8a7d7458db9701d4367 100644
--- a/modules/Users/actions/Save.php
+++ b/modules/Users/actions/Save.php
@@ -21,10 +21,10 @@ class Users_Save_Action extends Vtiger_Save_Action {
 		
 		if ($allowed) {
 			// Deny access if not administrator or account-owner or self
-			if(!$currentUserModel->isAdminUser()) {
+			if(!$currentUserModel->isAdminUser() && !$recordModel->isAccountOwner()) {
 				if (empty($record)) {
 					$allowed = false;
-				} else if (!$recordModel->isAccountOwner() || ($currentUserModel->get('id') != $recordModel->getId())) {
+				} else if ($currentUserModel->get('id') != $recordModel->getId()) {
 					$allowed = false;
 				}
 			}