diff --git a/ietf/static/js/meeting-interim-request.js b/ietf/static/js/meeting-interim-request.js
index e833cec1c..b7f7e3d99 100644
--- a/ietf/static/js/meeting-interim-request.js
+++ b/ietf/static/js/meeting-interim-request.js
@@ -207,11 +207,12 @@ const interimRequest = (function() {
 
         toggleLocation: function () {
             if (this.checked) {
-                $(".location")
+                $(".location input, .location select")
                     .prop('disabled', false);
             } else {
-                $(".location")
-                    .prop('disabled', true);
+                $(".location input, .location select")
+                    .prop('disabled', true)
+                    .val('');
             }
         },
 
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 977eaad3f..995a612b5 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -24,8 +24,8 @@
             </div>
         {% endif %}
         {% bootstrap_field form.meeting_type layout='horizontal' %}
-        {% bootstrap_field form.city layout='horizontal' %}
-        {% bootstrap_field form.country layout='horizontal' %}
+        {% bootstrap_field form.city layout='horizontal' wrapper_class='location mb-3' %}
+        {% bootstrap_field form.country layout='horizontal' wrapper_class='location mb-3' %}
         {% bootstrap_field form.time_zone layout='horizontal' %}
         {{ formset.management_form }}
         {% if formset.non_form_errors %}<div class="my-3 alert alert-danger">{{ formset.non_form_errors }}</div>{% endif %}