diff --git a/app/errors.py b/app/errors.py
index 0ef24a5f0..ff41b592d 100644
--- a/app/errors.py
+++ b/app/errors.py
@@ -64,6 +64,8 @@ def register_errors(blueprint):
                 'duplicate key value violates unique constraint "services_email_from_key"' in e.orig.pgerror):
             return jsonify(
                 result='error',
-                message={'name': ["Duplicate service name '{}'".format(e.params.get('name', ''))]}
+                message={'name': ["Duplicate service name '{}'".format(
+                    e.params.get('name', e.params.get('email_from', ''))
+                )]}
             ), 400
         return jsonify(result='error', message="Internal server error"), 500
diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py
index 8440afe4d..ff484278a 100644
--- a/tests/app/service/test_rest.py
+++ b/tests/app/service/test_rest.py
@@ -494,7 +494,10 @@ def test_should_not_update_service_with_duplicate_email_from(notify_api,
             assert resp.status_code == 400
             json_resp = json.loads(resp.get_data(as_text=True))
             assert json_resp['result'] == 'error'
-            assert "Duplicate service name '{}'".format(service_name) in json_resp['message']['name']
+            assert (
+                "Duplicate service name '{}'".format(service_name) in json_resp['message']['name'] or
+                "Duplicate service name '{}'".format(email_from) in json_resp['message']['name']
+            )
 
 
 def test_update_service_should_404_if_id_is_invalid(notify_api, notify_db, notify_db_session):