Added checks for email/twitter client