The `password || o.passwd` was added in commit @84346b20; I presume the corresponding changes want to be made to the b2g branch lines below (`addEmailToUser` and `updatePassword`).  Is that correct?