Fix #336
Fix #356
Add special welcome message when logging in with a token