remove the condition in fetching the email