improved session/user routing