fix login issues
Merge remote-tracking branch 'origin/newstaging' into newstaging