tweaks for login
Merge origin/YetAnothoerBranch into YetAnothoerBranch