Bug 6759: Split account creation and renewal charges