Login now works and notification shows currently logged on user
Merge remote-tracking branch 'origin/master'