Revert "Revert "better login failure message""

This reverts commit ac41ace18d89a8688413988c059835bb53653eed.