Login screen fixes