More login things
Merge branch 'master' of https://github.com/wangk1/Ambassador-org