A couple of fixes to handle the case where login is unknown