Email protection fix as well as removal of redundant dashboard check