diff --git a/app/assets/javascripts/updateContent.js b/app/assets/javascripts/updateContent.js
index 928aed1db..204e1c9ce 100644
--- a/app/assets/javascripts/updateContent.js
+++ b/app/assets/javascripts/updateContent.js
@@ -28,7 +28,12 @@
         'data': form ? $('#' + form).serialize() : {}
       }
     ).done(
-      response => flushQueue(queue, response)
+      response => {
+        flushQueue(queue, response);
+        if (response.stop === 1) {
+          poll = function(){};
+        }
+      }
     ).fail(
       () => poll = function(){}
     );
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 45782d66d..58faec735 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -437,12 +437,14 @@ def service_add_email_reply_to(service_id):
 @user_has_permissions('manage_service')
 def service_verify_reply_to_address(service_id, notification_id):
     is_new = request.args.get('is_new', False)
+    request_args = "?is_default={}&is_new={}".format(request.args.get('is_default', False), is_new)
     return render_template(
         'views/service-settings/email-reply-to/verify.html',
         service_id=service_id,
         notification_id=notification_id,
         partials=get_service_verify_reply_to_address_partials(service_id, notification_id),
-        verb=("Add" if is_new else "Change")
+        verb=("Add" if is_new else "Change"),
+        request_args=request_args
     )
 
 
@@ -454,16 +456,18 @@ def service_verify_reply_to_address_updates(service_id, notification_id):
 
 
 def get_service_verify_reply_to_address_partials(service_id, notification_id):
+    form = ServiceReplyToEmailForm()
+    first_email_address = current_service.count_email_reply_to_addresses == 0
     notification = notification_api_client.get_notification(current_app.config["NOTIFY_SERVICE_ID"], notification_id)
     verification_status = "pending"
-    is_default = request.args.get('is_default', False)
+    is_default = True if (request.args.get('is_default', False) == "True") else False
     if notification["status"] == "delivered":
         verification_status = "success"
         if notification["to"] not in [i["email_address"] for i in current_service.email_reply_to_addresses]:
             service_api_client.add_reply_to_email_address(
                 current_service.id,
                 email_address=notification["to"],
-                is_default=True if is_default == "True" else False
+                is_default=is_default
             )
     created_at_no_tz = notification["created_at"][:-6]
     seconds_since_sending = (datetime.utcnow() - datetime.strptime(created_at_no_tz, '%Y-%m-%dT%H:%M:%S.%f')).seconds
@@ -471,6 +475,8 @@ def get_service_verify_reply_to_address_partials(service_id, notification_id):
         "failed", "permanent-failure", "technical-failure", "temporary-failure"
     ] or (notification["status"] == "sending" and seconds_since_sending > 300):
         verification_status = "failure"
+        form.email_address.data = notification['to']
+        form.is_default.data = is_default
     return {
         'status': render_template(
             'views/service-settings/email-reply-to/_verify-updates.html',
@@ -479,7 +485,10 @@ def get_service_verify_reply_to_address_partials(service_id, notification_id):
             notification_id=notification_id,
             verification_status=verification_status,
             is_default=is_default,
+            form=form,
+            first_email_address=first_email_address
         ),
+        'stop': 0 if verification_status == "pending" else 1
     }
 
 
diff --git a/app/templates/views/service-settings/email-reply-to/_verify-updates.html b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
index 280d33c57..e583a7cc0 100644
--- a/app/templates/views/service-settings/email-reply-to/_verify-updates.html
+++ b/app/templates/views/service-settings/email-reply-to/_verify-updates.html
@@ -1,4 +1,9 @@
 {% from "components/banner.html" import banner, banner_wrapper %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/checkbox.html" import checkbox %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
 
 <div class="ajax-block-container">
   {% if verification_status == "pending" %}
@@ -29,6 +34,26 @@
         You can try again, or use a different address.
       </p>
     {% endcall %}
-    <a href={{ url_for('main.service_add_email_reply_to', service_id=service_id) }}>Try again</a>
+    <p>
+      Let recipients send replies to a shared inbox that’s managed by your team.
+    </p>
+    <p>
+      Do not use your own email address for replies.
+    </p>
+    {% call form_wrapper(
+      action = url_for('.service_add_email_reply_to', service_id=service_id)
+    ) %}
+      {{ textbox(
+        form.email_address,
+        width='2-3',
+        safe_error_message=True
+      ) }}
+      {% if not first_email_address %}
+        <div class="form-group">
+          {{ checkbox(form.is_default) }}
+        </div>
+      {% endif %}
+      {{ page_footer('Try again') }}
+    {% endcall %}
   {% endif %}
 </div>
diff --git a/app/templates/views/service-settings/email-reply-to/verify.html b/app/templates/views/service-settings/email-reply-to/verify.html
index 1592a010f..8f4c060d0 100644
--- a/app/templates/views/service-settings/email-reply-to/verify.html
+++ b/app/templates/views/service-settings/email-reply-to/verify.html
@@ -18,7 +18,7 @@
   ) }}
   {{ ajax_block(
       partials,
-      url_for('main.service_verify_reply_to_address_updates', service_id=service_id, notification_id=notification_id),
+      url_for('main.service_verify_reply_to_address_updates', service_id=service_id, notification_id=notification_id) + request_args,
       'status',
       finished=finished
     ) }}