diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index a24e8f584f6..d65f3ca11b5 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -39,8 +39,9 @@ class View(models.Model):
     def _set_pwd(self):
         crypt_context = self.env.user._crypt_context()
         for r in self:
-            r.sudo().visibility_password = crypt_context.encrypt(r.visibility_password_display)
-            r.visibility = r.visibility  # double check access
+            if r.type == 'qweb':
+                r.sudo().visibility_password = r.visibility_password_display and crypt_context.encrypt(r.visibility_password_display) or ''
+                r.visibility = r.visibility  # double check access
 
     def _compute_first_page_id(self):
         for view in self:
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index a9996029567..970aa309523 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -272,7 +272,7 @@
                     <field name="page_ids" invisible="1" />
                     <field name="first_page_id" attrs="{'invisible': [('page_ids', '=', [])]}" />
                     <field name="visibility" attrs="{'invisible': [('type', '!=', 'qweb')]}" />
-                    <field name="visibility_password_display" attrs="{'invisible': [('visibility', '!=', 'password')]}" password="True"/>
+                    <field name="visibility_password_display" attrs="{'invisible': [('visibility', '!=', 'password')]}" password="True" string="Visibility Password" />
                 </field>
                 <sheet position="before">
                     <header>