diff --git a/src/java/com/threerings/bureau/server/BureauSession.java b/src/java/com/threerings/bureau/server/BureauSession.java
new file mode 100644
index 000000000..a63aa6d2e
--- /dev/null
+++ b/src/java/com/threerings/bureau/server/BureauSession.java
@@ -0,0 +1,36 @@
+//
+// $Id: $
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.bureau.server;
+
+import com.threerings.presents.server.PresentsSession;
+
+public class BureauSession extends PresentsSession
+{
+    @Override // from PresentsSession
+    protected void sessionConnectionClosed ()
+    {
+        super.sessionConnectionClosed();
+
+        // end our session when the connection is closed
+        endSession();
+    }
+}
diff --git a/src/java/com/threerings/bureau/server/BureauSessionFactory.java b/src/java/com/threerings/bureau/server/BureauSessionFactory.java
index 64a086dc4..e41bc7bb6 100644
--- a/src/java/com/threerings/bureau/server/BureauSessionFactory.java
+++ b/src/java/com/threerings/bureau/server/BureauSessionFactory.java
@@ -47,9 +47,8 @@ public class BureauSessionFactory implements SessionFactory
     public Class<? extends PresentsSession> getSessionClass (AuthRequest areq)
     {
         // Just give bureaus a vanilla PresentsSession client for now.
-        // TODO: will bureaus need a more tailored client?
         if (areq.getCredentials() instanceof BureauCredentials) {
-            return PresentsSession.class;
+            return BureauSession.class;
         } else {
             return _delegate.getSessionClass(areq);
         }