diff --git a/backend/__init__.py b/backend/__init__.py
index 220a1aa7..3e57dc0a 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -483,7 +483,10 @@ def changedetection_app(config=None, datastore_o=None):
                 flash("Password protection enabled.", 'notice')
                 flask_login.logout_user()
                 return redirect(url_for('index'))
-
+            else:
+                # Unset it anyway, just to be sure.
+                datastore.data['settings']['application']['password'] = False
+                
             flash("Settings updated.")
 
         if request.method == 'POST' and not form.validate():
diff --git a/backend/forms.py b/backend/forms.py
index 615b834f..681d3545 100644
--- a/backend/forms.py
+++ b/backend/forms.py
@@ -46,11 +46,12 @@ class SaltyPasswordField(StringField):
     # incoming
     def process_formdata(self, valuelist):
         if valuelist:
-            # Remove empty strings
-            self.encrypted_password = self.build_password(valuelist[0])
-            self.data = []
+            # Be really sure it's non-zero in length
+            if len(valuelist[0].strip()) > 0:
+                self.encrypted_password = self.build_password(valuelist[0])
+                self.data = ""
         else:
-            self.data = []
+            self.data = False
 
 
 # Separated by  key:value