diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index b8af335a17e..6b6f119fd88 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -40,7 +40,7 @@ class ir_http(orm.AbstractModel):
     def _auth_method_public(self):
         if not request.session.uid:
             website = self.pool['website'].get_current_website(request.cr, openerp.SUPERUSER_ID, context=request.context)
-            if website:
+            if website and website.user_id:
                 request.uid = website.user_id.id
             else:
                 request.uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base', 'public_user')
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index aef827b86a8..b4b95f00ab5 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -166,7 +166,7 @@ class website(osv.osv):
         'social_youtube': fields.char('Youtube Account'),
         'social_googleplus': fields.char('Google+ Account'),
         'google_analytics_key': fields.char('Google Analytics Key'),
-        'user_id': fields.many2one('res.users', string='Public User'),
+        'user_id': fields.many2one('res.users', string='Public User', required=True),
         'compress_html': fields.boolean('Compress HTML'),
         'cdn_activated': fields.boolean('Activate CDN for assets'),
         'cdn_url': fields.char('CDN Base URL'),