Fixed login screen issues
Merge remote-tracking branch 'origin/master'
Fixed login screen issues