Fixing Override email bugs