diff --git a/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java b/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java
index ce38fe592..cafe326e5 100644
--- a/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java
+++ b/app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java
@@ -121,6 +121,7 @@ public class PasswordActivity extends StylishActivity
     private CompoundButton checkboxPasswordView;
     private CompoundButton checkboxKeyfileView;
     private CompoundButton checkboxDefaultDatabaseView;
+    private CompoundButton.OnCheckedChangeListener enableButtonOncheckedChangeListener;
 
     private DefaultCheckChange defaultCheckChange;
     private ValidateButtonViewClickListener validateButtonViewClickListener;
@@ -322,6 +323,18 @@ public class PasswordActivity extends StylishActivity
         // For check shutdown
         super.onResume();
 
+        // Enable or not the open button
+        if (!PreferencesUtil.emptyPasswordAllowed(PasswordActivity.this)) {
+            confirmButtonView.setEnabled(checkboxPasswordView.isChecked());
+        } else {
+            confirmButtonView.setEnabled(true);
+        }
+        enableButtonOncheckedChangeListener = (buttonView, isChecked) -> {
+            if (!PreferencesUtil.emptyPasswordAllowed(PasswordActivity.this)) {
+                confirmButtonView.setEnabled(isChecked);
+            }
+        };
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             // Check if fingerprint well init (be called the first time the fingerprint is configured
             // and the activity still active)
@@ -511,6 +524,9 @@ public class PasswordActivity extends StylishActivity
                     }
                 }
             }
+
+            // Add old listener to enable the button, only be call here because of onCheckedChange bug
+            enableButtonOncheckedChangeListener.onCheckedChanged(compoundButton, checked);
         });
 
         // callback for fingerprint findings
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java
index 62025bb8e..ee713e0ea 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.java
@@ -152,6 +152,12 @@ public class PreferencesUtil {
                 context.getString(R.string.setting_icon_pack_choose_default));
     }
 
+    public static boolean emptyPasswordAllowed(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean(context.getString(R.string.allow_no_password_key),
+                context.getResources().getBoolean(R.bool.allow_no_password_default));
+    }
+
     /**
      * All preference keys associated with education
      */
diff --git a/app/src/main/res/color/text_color_button.xml b/app/src/main/res/color/text_color_button.xml
new file mode 100644
index 000000000..7c2d988bf
--- /dev/null
+++ b/app/src/main/res/color/text_color_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/grey" android:state_enabled="false" />
+    <item android:color="@color/colorTextInverse" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/button_background.xml b/app/src/main/res/drawable-v21/button_large_enable.xml
similarity index 100%
rename from app/src/main/res/drawable-v21/button_background.xml
rename to app/src/main/res/drawable-v21/button_large_enable.xml
diff --git a/app/src/main/res/drawable/button_large.xml b/app/src/main/res/drawable/button_large.xml
new file mode 100644
index 000000000..dfb9db2d0
--- /dev/null
+++ b/app/src/main/res/drawable/button_large.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/button_large_enable" android:state_enabled="true" />
+    <item android:drawable="@drawable/button_large_disable" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_large_disable.xml b/app/src/main/res/drawable/button_large_disable.xml
new file mode 100644
index 000000000..201c24fcb
--- /dev/null
+++ b/app/src/main/res/drawable/button_large_disable.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners
+                android:radius="0dp" />
+            <padding
+                android:left="0dp"
+                android:right="0dp"
+                android:top="12dp"
+                android:bottom="12dp"/>
+            <solid android:color="@color/grey_dark"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_large_enable.xml b/app/src/main/res/drawable/button_large_enable.xml
new file mode 100644
index 000000000..737973744
--- /dev/null
+++ b/app/src/main/res/drawable/button_large_enable.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners
+                android:radius="0dp" />
+            <padding
+                android:left="0dp"
+                android:right="0dp"
+                android:top="12dp"
+                android:bottom="12dp"/>
+            <solid android:color="@color/orange"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f3e4e8e4c..6d1f08c8a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,8 @@
 	<color name="white">#ffffff</color>
 	<color name="black">#000000</color>
     <color name="dark">#0e0e0e</color>
+    <color name="grey">#bdbdbd</color>
+    <color name="grey_dark">#9e9e9e</color>
 
     <color name="orange_light">#ffa726</color>
     <color name="orange">#fb8c00</color>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 31a0ef50a..7ee71eadf 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -93,6 +93,7 @@
     <string name="education_screen_reclicked_key" translatable="false">education_screen_reclicked_key</string>
     <string name="settings_appearance_key" translatable="false">settings_appearance_key</string>
     <string name="magic_keyboard_key" translatable="false">magic_keyboard_key</string>
+    <string name="allow_no_password_key" translatable="false">allow_no_password_key</string>
 
     <bool name="maskpass_default" translatable="false">true</bool>
     <bool name="keyfile_default" translatable="false">true</bool>
@@ -124,6 +125,7 @@
     <bool name="education_entry_new_field_default" translatable="false">false</bool>
     <bool name="education_screen_reclicked_default" translatable="false">false</bool>
     <bool name="magic_keyboard_default" translatable="false">false</bool>
+    <bool name="allow_no_password_default" translatable="false">true</bool>
 
     <string name="app_timeout_default" translatable="false">300000</string>
     <string name="clipboard_timeout_default" translatable="false">60000</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7d2e8e5c..27f69c84e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -265,6 +265,8 @@
     <string name="keyboard">Keyboard</string>
     <string name="magic_keyboard_title">Magikeyboayd</string>
     <string name="magic_keyboard_summary">Activate a custom keyboard that populates your passwords and all your identity fields easily.</string>
+    <string name="allow_no_password_title">Allow no password</string>
+    <string name="allow_no_password_summary">Enable the open button if no password identification is selected.</string>
 
     <string name="reset_education_screens_title">Reset education screens</string>
     <string name="reset_education_screens_summary">Highlight the elements to learn how the application works</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b34d1b73..cf64837b5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -249,8 +249,8 @@
     <!-- Button Style -->
     <style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button" />
     <style name="KeepassDXStyle.Button" parent="KeepassDXStyle.v21.Button">
-        <item name="android:textColor">?attr/textColorInverse</item>
-        <item name="android:background">@drawable/button_background</item>
+        <item name="android:textColor">@color/text_color_button</item>
+        <item name="android:background">@drawable/button_large</item>
         <item name="android:gravity">center</item>
     </style>
     <style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button">
diff --git a/app/src/main/res/xml/application_preferences.xml b/app/src/main/res/xml/application_preferences.xml
index cda8d73ee..0bc6cc08c 100644
--- a/app/src/main/res/xml/application_preferences.xml
+++ b/app/src/main/res/xml/application_preferences.xml
@@ -20,6 +20,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        android:title="@string/general">
+
+        <SwitchPreference
+            android:summary="@string/allow_no_password_summary"
+            android:defaultValue="@bool/allow_no_password_default"
+            android:title="@string/allow_no_password_title"
+            android:key="@string/allow_no_password_key"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:title="@string/search_label">