Email fixes
Add invalidate