fixed login race condition
Merge remote-tracking branch 'origin'