temp patch to make affiliate show work for scenarios where the account is not created
Merge remote-tracking branch 'origin/master'
temp patch to make affiliate show work for scenarios where the account is not created - after merge