More Login GUI stuff
Merge commit 'bfd38f64c24e25aba5cf03fabbd0aa1a867abf02'