Rearrange add_user args to maintain compatibility