Finish tweaking login screen for bug 45399