Clean up initial session creation and auto-login
Merge branch 'config' into devel