Email option fix