Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 509)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 510)
@@ -601,4 +601,8 @@
     return templates.info(searchList=[d])
 
+def unauthFront(_, fields):
+    """Information for unauth'd users."""
+    return templates.unauth(searchList=[{'simple' : True}])
+
 mapping = dict(list=listVms,
                vnc=vnc,
@@ -607,5 +611,6 @@
                info=info,
                create=create,
-               help=helpHandler)
+               help=helpHandler,
+               unauth=unauthFront)
 
 def printHeaders(headers):
@@ -618,6 +623,8 @@
 def getUser():
     """Return the current user based on the SSL environment variables"""
-    username = os.environ['SSL_CLIENT_S_DN_Email'].split("@")[0]
-    return username
+    email = os.environ.get('SSL_CLIENT_S_DN_Email', None)
+    if email is None:
+        return None
+    return email.split("@")[0]
 
 def main(operation, user, fields):
@@ -675,4 +682,7 @@
         sys.exit(0)
 
+    if u is None:
+        operation = 'unauth'
+
     if operation.startswith('/'):
         operation = operation[1:]
Index: trunk/packages/sipb-xen-www/code/templates/__init__.py
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/__init__.py	(revision 509)
+++ trunk/packages/sipb-xen-www/code/templates/__init__.py	(revision 510)
@@ -1,3 +1,3 @@
-__all__ = 'info command error help invalid list vnc'.split()
+__all__ = 'info command error help invalid list unauth vnc'.split()
 for _name in __all__:
     try:
Index: trunk/packages/sipb-xen-www/code/templates/unauth.tmpl
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/unauth.tmpl	(revision 510)
+++ trunk/packages/sipb-xen-www/code/templates/unauth.tmpl	(revision 510)
@@ -0,0 +1,32 @@
+#from skeleton import skeleton
+#extends skeleton
+
+
+#def title
+Intro
+#end def
+
+#def body
+<h1>XVM &mdash; Virtual Servers for MIT </h1>
+
+<p><strong>xvm.mit.edu</strong> is a virtualization service for the
+MIT community.  We offer <strong>virtual machines</strong>&mdash;your
+own complete system on which you can start from our <strong>two-minute
+Debian</strong> Linux auto-install or install the operating
+<strong>system of your choice</strong>.  The service is <strong>free
+to any Athena account holder</strong>.  </p>
+
+<p>If you're a member of the MIT community, go <a
+href="https://xvm.mit.edu/"><strong>try out the service</strong>
+now</a>.  You'll need an <a href="http://ca.mit.edu/">MIT personal
+certificate</a>.</p>
+
+<p>xvm.mit.edu is provided by <a href="http://sipb.mit.edu/">SIPB</a>,
+the <strong>student computing group</strong> at MIT, with generous
+funding from <a href="http://web.mit.edu/ist/">IS&amp;T</a>.  Like all
+SIPB projects, we are independently run by our own team of volunteers,
+and we welcome new contributors.</p>
+
+<p>Questions and <strong>feedback welcome</strong> at <tt>xvm@mit.edu</tt>.</p>
+
+#end def