Login screen corrections
Merge commit 'b456d9f9b27e8ea17087e2f9bf3c8a86bf29aa92'