diff --git a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newPersonCredentialUpdate.xml b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newPersonCredentialUpdate.xml
index cb8017c373784de888bb82919a7be0ee1adae522..60be8b1b415957a7decfb077912668b949807b3c 100644
--- a/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newPersonCredentialUpdate.xml
+++ b/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newPersonCredentialUpdate.xml
@@ -97,7 +97,8 @@ else:\n
   # within same transaction and update client side credentials cookie \n
   username = person.getReference()\n
   if password and username == str(portal.portal_membership.getAuthenticatedMember()):\n
-    credential_update.accept()\n
+    # The password is updated synchronously and the the rest of the credential Update is done later\n
+    credential_update.Credential_updatePersonPassword()\n
     portal.cookie_authentication.credentialsChanged(username, username, password)\n
     portal_status_message = "Password changed."\n
 \n