Switched to setting the account status instead of auto-activate.