diff --git a/src/config.py b/src/config.py
index 9c887cb30..1e3f18d54 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1120,8 +1120,8 @@ class Account_modification_window:
 			
 			for opt in config:
 				gajim.config.set_per('accounts', name, opt, config[opt])
-			if save_password:
-				gajim.connections[name].password = password
+			if config['savepass']:
+				gajim.connections[name].password = config['password']
 			#refresh accounts window
 			if self.plugin.windows.has_key('accounts'):
 				self.plugin.windows['accounts'].init_accounts()