mail fixes user validation fixes
mail fixes user validation fixes