Login and session.user
Merge remote-tracking branch 'origin/Decorators'