diff --git a/src/jmc/jabber/component.py b/src/jmc/jabber/component.py
index bb7beea..4de02cf 100644
--- a/src/jmc/jabber/component.py
+++ b/src/jmc/jabber/component.py
@@ -568,10 +568,10 @@ class MailComponent(Component):
 	else:
 	    login = u""
 
-	if x.fields.has_key("password"):
+	if x.fields.has_key("password") and x.fields["password"].value != "":
 	    password = x.fields["password"].value
 	else:
-	    password = u""
+	    password = None
 
 	store_password = x.fields.has_key("store_password") \
                          and (x.fields["store_password"].value == "1")