am 93237251: am f733ae63: Don\'t break on setting default password

* commit '93237251d5891bb62dd27f00b115a52425ff3d2c':
  Don't break on setting default password