Revert "Revert "changes for affiliate account creation""

This reverts commit 89e59fb3bca47ffe5f29676afa5b0017c100f5d1.