Addresses #3797. Re-submitting this as a quick fix to the immediate issue while I think about the website field.