Bugfix: Move token creation to User singleton
Finish sign in / out