Fixed email address bug