diff --git a/src/common/passwords.py b/src/common/passwords.py
index 8c29bef68..316a69310 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -41,27 +41,26 @@ class GnomePasswordStorage(object):
 	def get_password(self, account_name):
 		conf = gajim.config.get_per('accounts', account_name, 'password')
 		try:
-			unused, auth_token = conf.split("gnomekeyring:")
+			unused, auth_token = conf.split('gnomekeyring:')
 			auth_token = int(auth_token)
-			print "load: token for account %s: %i" % (account_name, auth_token)
 		except ValueError:
 			password = conf
 			## migrate the password over to keyring
 			self.save_password(account_name, password, update=False)
 			return password
 		try:
-			return gnomekeyring.item_get_info_sync(self.keyring, auth_token).get_secret()
+			return gnomekeyring.item_get_info_sync(self.keyring,
+				auth_token).get_secret()
 		except gnomekeyring.DeniedError:
 			return None
 		
 	def save_password(self, account_name, password, update=True):
-		display_name = ("Gajim account %s" % (account_name,))
+		display_name = _('Gajim account %s') % account_name
 		attributes = dict(account_name=str(account_name), gajim=1)
 		auth_token = gnomekeyring.item_create_sync(
 			self.keyring, gnomekeyring.ITEM_GENERIC_SECRET,
 			display_name, attributes, password, update)
-		print "save(update=%i): token for account %s: %i" % (update, account_name, auth_token)
-		token = "gnomekeyring:%i" % (auth_token,)
+		token = 'gnomekeyring:%i' % (auth_token,)
 		gajim.config.set_per('accounts', account_name, 'password', token)