Bug fix the email available directive