% endif
% if not simple:
-% if user:
-<p class="loggedin">Welcome, <span class="name">${user}</span>.</p>
+% if cherrypy.request.login:
+<p class="loggedin">Welcome, <span class="name">${cherrypy.request.login}</span>.</p>
% endif
<ul class="navigation">