diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index c548317909..70a989803c 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1679,7 +1679,10 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                             String password1 = etPassword1.getEditText().getText().toString();
                             String password2 = etPassword2.getEditText().getText().toString();
 
-                            if (TextUtils.isEmpty(password1) && !BuildConfig.DEBUG)
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                            boolean debug = prefs.getBoolean("debug", false);
+
+                            if (TextUtils.isEmpty(password1) && !(debug || BuildConfig.DEBUG))
                                 ToastEx.makeText(context, R.string.title_setup_password_missing, Toast.LENGTH_LONG).show();
                             else {
                                 if (password1.equals(password2)) {
@@ -1739,7 +1742,10 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                         public void onClick(DialogInterface dialog, int which) {
                             String password1 = etPassword1.getEditText().getText().toString();
 
-                            if (TextUtils.isEmpty(password1) && !BuildConfig.DEBUG)
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                            boolean debug = prefs.getBoolean("debug", false);
+
+                            if (TextUtils.isEmpty(password1) && !(debug || BuildConfig.DEBUG))
                                 ToastEx.makeText(context, R.string.title_setup_password_missing, Toast.LENGTH_LONG).show();
                             else {
                                 ActivitySetup activity = (ActivitySetup) getActivity();
diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml
index afa261f190..b9c100b858 100644
--- a/app/src/main/res/layout/fragment_options_synchronize.xml
+++ b/app/src/main/res/layout/fragment_options_synchronize.xml
@@ -659,8 +659,11 @@
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvCaptionChecks"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:drawableStart="@drawable/twotone_flag_24"
+                    android:drawablePadding="6dp"
+                    android:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_advanced_caption_checks"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -674,9 +677,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
                     android:checked="true"
-                    android:drawableStart="@drawable/twotone_flag_24"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorWarning"
                     android:text="@string/title_advanced_check_authentication"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -701,9 +701,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
                     android:checked="true"
-                    android:drawableStart="@drawable/twotone_flag_24"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorWarning"
                     android:text="@string/title_advanced_check_reply_domain"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -727,9 +724,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:drawableStart="@drawable/twotone_flag_24"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorWarning"
                     android:text="@string/title_advanced_check_mx"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -766,9 +760,6 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:drawableStart="@drawable/twotone_flag_24"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorWarning"
                     android:text="@string/title_advanced_check_blocklist"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"