Made email-disabling more explicit