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

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