New login design back-ported from 2.4
(cherry picked from commit 1605d94079fed5822ef1069eee05541d0ebc20ca)
New login design back-ported from 2.4
(cherry picked from commit 1605d94079fed5822ef1069eee05541d0ebc20ca)