diff --git a/draft/application/cms/src/modules/user/user_edit_cms_execution.e b/draft/application/cms/src/modules/user/user_edit_cms_execution.e
index d4930d69..6b60605b 100644
--- a/draft/application/cms/src/modules/user/user_edit_cms_execution.e
+++ b/draft/application/cms/src/modules/user/user_edit_cms_execution.e
@@ -76,7 +76,7 @@ feature -- Execution
 						b.append ("</li>")
 					end
 
-					if attached {WSF_STRING} fd.item ("password") as s_password then
+					if attached {WSF_STRING} fd.item ("password") as s_password  and then not s_password.is_empty then
 						u.set_password (s_password.value)
 					end
 					if attached {WSF_STRING} fd.item ("email") as s_email then