diff --git a/src/common/passwords.py b/src/common/passwords.py
index 08514bbda..9d0d8bdd5 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -48,11 +48,9 @@ class SimplePasswordStorage(PasswordStorage):
 
 class GnomePasswordStorage(PasswordStorage):
 	def __init__(self):
-		# self.keyring = gnomekeyring.get_default_keyring_sync() 
-
-		## above line commented and code below inserted as workaround
-		## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019
-		self.keyring = "default"
+		 self.keyring = gnomekeyring.get_default_keyring_sync()
+		 if self.keyring is None:
+			self.keyring = 'default'
 		try:
 			gnomekeyring.create_sync(self.keyring, None)
 		except gnomekeyring.AlreadyExistsError: