Login: improve first responder handling