Fixed email change errors