Merge branch '5905-duplicate-email-errors' into 'master'

Only show one error message for an invalid email

Changes it to only validate the notification_email format if it's different from email.

Closes #5905

See merge request !7158