Merging changed made for 3 3 3 hotfix

Which allow multiple users to login (and other minor changes)