diff --git a/src/config.py b/src/config.py
index 5150998b0..16b4a0fa9 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1206,8 +1206,7 @@ class AccountModificationWindow:
 		self.xml.get_widget('save_password_checkbutton').set_active(
 			gajim.config.get_per('accounts', self.account, 'savepass'))
 		if gajim.config.get_per('accounts', self.account, 'savepass'):
-			passstr = gajim.config.get_per('accounts',
-						self.account, 'password')
+			passstr = passwords.get_password(self.account)
 			password_entry = self.xml.get_widget('password_entry')
 			password_entry.set_sensitive(True)
 			password_entry.set_text(passstr)