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

* commit 'f733ae6306b1a6226492015e7f475a17df32f681':
  Don't break on setting default password