diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi
index 942839ac..bcf12569 100644
--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi
+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi
@@ -27,7 +27,8 @@ public class Key {
     [CCode(array_null_terminated = true)]
     public UserID[] uids;
     public KeylistMode keylist_mode;
-    public string fpr;
+    // public string fpr; // requires gpgme >= 1.7.0
+    public string fpr { get { return subkeys[0].fpr; } }
 }
 
 [CCode (cname = "struct _gpgme_user_id")]
diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala
index 1ebf5c58..e4077c42 100644
--- a/plugins/openpgp/src/account_settings_widget.vala
+++ b/plugins/openpgp/src/account_settings_widget.vala
@@ -50,6 +50,8 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
     }
 
     private void activate_current_account() {
+        combobox.changed.disconnect(key_changed);
+
         string? account_key = plugin.db.get_account_key(current_account);
         int activate_index = 0;
         for (int i = 0; i < keys.size; i++) {
@@ -63,6 +65,8 @@ private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
         TreeIter selected;
         combobox.get_active_iter(out selected);
         set_label_active(selected);
+
+        combobox.changed.connect(key_changed);
     }
 
     private void populate_list_store() {