Merge "Fix not updating error message when authentication fails"