[WIP] Preserve kB on password change