Fixing issue with empty disabled and emails.