Index: package_branches/invirt-web/cherrypy/code/templates/skeleton.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/skeleton.mako	(revision 2409)
+++ package_branches/invirt-web/cherrypy/code/templates/skeleton.mako	(revision 2410)
@@ -47,6 +47,6 @@
 
 % 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