Mitigation for issue #1232

This mitigates the issue with site creation for new accounts. We should consider as a hotfix, which is why this is against the master branch