diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index ea073102e0..cfe5d26d3b 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -872,7 +872,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                         if ("pro".equals(key) && !BuildConfig.DEBUG)
                             continue;
 
-                        if ("biometrics".equals(key) && !Helper.canAuthenticate(context))
+                        if ("biometrics".equals(key) || "pin".equals(key))
                             continue;
 
                         if ("alert_once".equals(key))
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
index ad910da654..6aec2ee90a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
@@ -246,8 +246,13 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
                             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
                             if (TextUtils.isEmpty(pin))
                                 prefs.edit().remove("pin").apply();
-                            else
-                                prefs.edit().putString("pin", pin).apply();
+                            else {
+                                boolean pro = ActivityBilling.isPro(getContext());
+                                if (pro)
+                                    prefs.edit().putString("pin", pin).apply();
+                                else
+                                    startActivity(new Intent(getContext(), ActivityBilling.class));
+                            }
                         }
                     })
                     .setNegativeButton(android.R.string.cancel, null)