Fixed email errors