am ba6a68c8: Merge "Fix not updating error message when authentication fails"

* commit 'ba6a68c8c135c112117c56562b4e159e859a36bd':
  Fix not updating error message when authentication fails