Rework due to fetch proxy from email