Fix erroneous messages on password screen