Modify error handling during login (see #10011)
Merge pull request #883 from jburel/system-failure

Modify error handling during login (see #10011)