--- a/web/views/basetemplates.py	Tue Jun 23 13:31:35 2009 +0200
+++ b/web/views/basetemplates.py	Tue Jun 23 13:36:38 2009 +0200
@@ -12,7 +12,7 @@
 
 from cubicweb.vregistry import objectify_selector
 from cubicweb.selectors import match_kwargs
-from cubicweb.view import View, MainTemplate,  NOINDEX, NOFOLLOW, STRICT_DOCTYPE
+from cubicweb.view import View, MainTemplate, NOINDEX, NOFOLLOW
 from cubicweb.utils import make_uid, UStringIO
 
 # main templates ##############################################################
@@ -86,7 +86,7 @@
         xhtml_wrap = (self.req.form.has_key('__notemplate') and view.templatable
                       and view.content_type == self.req.html_content_type())
         if xhtml_wrap:
-            view.w(u'<?xml version="1.0"?>\n' + STRICT_DOCTYPE)
+            view.w(u'<?xml version="1.0"?>\n' + self.doctype)
             view.w(u'<div xmlns="http://www.w3.org/1999/xhtml" xmlns:cubicweb="http://www.logilab.org/2008/cubicweb">')
         # have to replace our unicode stream using view's binary stream
         view.render()
@@ -441,7 +441,7 @@
         self.w(u'<div id="%s" class="%s">' % (id, klass))
         if title:
             self.w(u'<div id="loginTitle">%s</div>'
-                   % self.req.property_value('ui.site-title'))
+                   % (self.req.property_value('ui.site-title') or u'&nbsp;'))
         self.w(u'<div id="loginContent">\n')
 
         if message: