Follow-up to r56684 - set message keys in Login.php, and readd the ExternalUser check...