Fix another EL-STUPIDO bug with upsert on passwords
Attempt to consolidate profile/account editing options.