Fix initial session problem of user not being logged in
Merge branch 'brian'