diff --git a/data/default_config.cfg b/data/default_config.cfg
index 18493968..662fb44e 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -28,6 +28,7 @@ default_nick =
 jid = 
 
 # A password is needed only if you specified a jid. It will be ignored otherwise
+# If you leave this empty, the password will be asked at each startup
 password = 
 
 # the rooms you will join automatically on startup, with associated nickname or not
diff --git a/src/connection.py b/src/connection.py
index d29fec82..d1de40d6 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -25,6 +25,7 @@ from gettext import (bindtextdomain, textdomain, bind_textdomain_codeset,
                      gettext as _)
 
 import sys
+import getpass
 import sleekxmpp
 
 from config import config
@@ -43,7 +44,7 @@ class Connection(sleekxmpp.ClientXMPP):
             # many features will be handled diferently
             # depending on this setting
             jid = '%s/%s' % (config.get('jid', ''), resource)
-            password = config.get('password', '')
+            password = config.get('password', '') or getpass.getpass()
         else: # anonymous auth
             self.anon = True
             jid = '%s/%s' % (config.get('server', 'anon.louiz.org'), resource)