diff --git a/src/common/passwords.py b/src/common/passwords.py
index b189b6192..901adeb44 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -86,7 +86,8 @@ class GnomePasswordStorage(PasswordStorage):
 			display_name, attributes, password, update)
 		token = 'gnomekeyring:%i' % auth_token
 		gajim.config.set_per('accounts', account_name, 'password', token)
-		gajim.connections[account_name].password = password
+		if gajim.connections.has_key(account_name):
+			gajim.connections[account_name].password = password
 
 storage = None
 def get_storage():