Fixes: Support Email is added