Improve error messages in login
Merge remote-tracking branch 'chiiph/bug/improve_error_msgs' into develop