Fix bug in initial billing.
Fix bug in initial email notification.