Changed user login error message
Merge remote-tracking branch 'upstream/master'