Got a user pulling his config from the website, and it correctly operates when he goes to a site from there
Merge conflicts