Index: /package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2676)
+++ /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2677)
@@ -140,6 +140,5 @@
             subject = [subject]
 
-        return dict(user=cherrypy.request.login,
-                    simple=simple,
+        return dict(simple=simple,
                     subjects=subject,
                     mapping=help_mapping)
Index: /package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako	(revision 2676)
+++ /package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako	(revision 2677)
@@ -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