[rhel7-branch 1/1] More descriptive message on invalid username