Restore bad username or password message
(cherry picked from commit ca44a37cad5e905e3a76b6ce862de6ec5d3bcb06)
Restore bad username or password message
(cherry picked from commit ca44a37cad5e905e3a76b6ce862de6ec5d3bcb06)