diff --git a/src/common/passwords.py b/src/common/passwords.py
index f36cfd332..ee017d81b 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -142,7 +142,8 @@ class GnomePasswordStorage(PasswordStorage):
             GnomeKeyring.ItemType.NETWORK_PASSWORD, display_name, attributes1,
             password, update)
         if err != GnomeKeyring.Result.OK:
-            if err == GnomeKeyring.Result.DENIED:
+            if err in (GnomeKeyring.Result.DENIED,
+            GnomeKeyring.Result.CANCELLED):
                 set_storage(SimplePasswordStorage())
                 storage.save_password(account_name, password)
                 return