Fixed email address overflow