diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 34081cdbb..78e371363 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -391,9 +391,8 @@ def service_add_email_reply_to(service_id):
                 service_id, form.email_address.data
             )["data"]["id"]
         except HTTPError as e:
-            error_msg = "Your service already uses ‘{}’ as an email reply-to address.".format(form.email_address.data)
-            if e.status_code == 400 and error_msg == e.message:
-                flash(error_msg, 'error')
+            if e.status_code == 409 or e.status_code == 400:
+                flash(e.message, 'error')
                 return redirect(url_for('.service_email_reply_to', service_id=service_id))
             else:
                 raise e
@@ -519,9 +518,8 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
                 service_id, form.email_address.data
             )["data"]["id"]
         except HTTPError as e:
-            error_msg = "Your service already uses ‘{}’ as an email reply-to address.".format(form.email_address.data)
-            if e.status_code == 400 and error_msg == e.message:
-                flash(error_msg, 'error')
+            if e.status_code == 400 or e.status_code == 409:
+                flash(e.message, 'error')
                 return redirect(url_for('.service_email_reply_to', service_id=service_id))
             else:
                 raise e