I think I fixed the login error when the user with the sessions id is
not found.
Merge branch 'master' into heroku