Fix bug in new org creation

This should resolve the issue on master.