diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index d3cd6b3b0a..a213cae4d5 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -878,6 +878,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                         if ("alert_once".equals(key))
                             continue;
 
+                        if (key != null && key.startsWith("widget."))
+                            continue;
+
                         Object value = jsetting.get("value");
                         String type = jsetting.optString("type");
                         Log.i("Setting name=" + key + " value=" + value + " type=" + type);
diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
index 822df73898..0a2d9fdf22 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
@@ -83,6 +83,8 @@ public class ActivityWidgetUnified extends ActivityBase {
                 SharedPreferences.Editor editor = prefs.edit();
                 if (account != null && account.id > 0)
                     editor.putString("widget." + appWidgetId + ".name", account.name);
+                else
+                    editor.remove("widget." + appWidgetId + ".name");
                 editor.putLong("widget." + appWidgetId + ".account", account == null ? -1L : account.id);
                 editor.putBoolean("widget." + appWidgetId + ".unseen", cbUnseen.isChecked());
                 editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked());