fix issues with sessions and user routing
Merge branch 'feature-user-routing' into develop