Configured email validation on update

app/models/user.rb

@@ -16,7 +16,7 @@ class User < ActiveRecord::Base
   validates :role, :name, presence: true
   validates :email, format: {
     with: email_regex,
-    on: :create,
+    on: [:create, :update],
     allow_nil: true,
     message: I18n.t('dictionary.invalid_email', email: Settings.mail_tech_support)
   }

app/views/users/edit.html.slim

@@ -1,14 +1,9 @@
-h2 Edit #{@user.email}
+h2 Edit #{@user.name}
 
 = form_for @user do |f|
-  - if @user.errors.any?
-    #error_explanation
-      h2 = "#{pluralize(@user.errors.count, "error")} prohibited this user from being saved:"
-      ul
-        - @user.errors.full_messages.each do |message|
-          li = message
 
   .form-group
+    = f.label :email, @user.errors[:email].join(', ').html_safe, class: 'error' if @user.errors[:email].present?
     = f.label :email
     = f.text_field :email
   .form-group

config/locales/en.yml

@@ -37,7 +37,6 @@ en:
           attributes:
             email:
               blank: 'Enter your email address'
-              invalid: You must enter an @hmcts.gsi.gov.uk email address
               not_found: That email is not registered on our system
             name:
               blank: You must enter a name for the user