Fixed error when editing user email address when mail module is  not installed
Merge branch 'jag/edit-user-mail-without-mail-module' into 3.2