--- a/server/repository.py	Wed Dec 09 17:10:01 2009 +0100
+++ b/server/repository.py	Wed Dec 09 17:48:04 2009 +0100
@@ -542,11 +542,12 @@
         # use an internal connection
         session = self.internal_session()
         # try to get a user object
+        cnxprops = kwargs.pop('cnxprops', None)
         try:
             user = self.authenticate_user(session, login, **kwargs)
         finally:
             session.close()
-        session = Session(user, self, kwargs.get('cnxprops'))
+        session = Session(user, self, cnxprops)
         user._cw = user.cw_rset.req = session
         user.clear_related_cache()
         self._sessions[session.id] = session