diff --git a/application/classes/modules/user/entity/User.entity.class.php b/application/classes/modules/user/entity/User.entity.class.php
index 18d0bad1..907a5a1e 100644
--- a/application/classes/modules/user/entity/User.entity.class.php
+++ b/application/classes/modules/user/entity/User.entity.class.php
@@ -110,10 +110,10 @@ class ModuleUser_EntityUser extends Entity
      */
     public function ValidateLoginExists($sValue, $aParams)
     {
-        if (!$this->User_GetUserByLogin($sValue)) {
-            return true;
+        if ($oUserOld = $this->User_GetUserByLogin($sValue) and $oUserOld->getId() != $this->getId()) {
+            return $this->Lang_Get('auth.registration.notices.error_login_used');
         }
-        return $this->Lang_Get('auth.registration.notices.error_login_used');
+        return true;
     }
 
     /**
@@ -125,10 +125,10 @@ class ModuleUser_EntityUser extends Entity
      */
     public function ValidateMailExists($sValue, $aParams)
     {
-        if (!$this->User_GetUserByMail($sValue)) {
-            return true;
+        if ($oUserOld = $this->User_GetUserByMail($sValue) and $oUserOld->getId() != $this->getId()) {
+            return $this->Lang_Get('auth.registration.notices.error_mail_used');
         }
-        return $this->Lang_Get('auth.registration.notices.error_mail_used');
+        return true;
     }
 
     /**
diff --git a/framework b/framework
index 019a61c9..13717ef6 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 019a61c9735354cf3a710ce432405380f0583d9b
+Subproject commit 13717ef65ec9d1d630427151a6981615db40b123