diff --git a/netbox/circuits/forms/models.py b/netbox/circuits/forms/models.py
index aebdce10e..da9e45a13 100644
--- a/netbox/circuits/forms/models.py
+++ b/netbox/circuits/forms/models.py
@@ -160,13 +160,23 @@ class CircuitTerminationForm(NetBoxModelForm):
     )
     provider_network = DynamicModelChoiceField(
         queryset=ProviderNetwork.objects.all(),
+        query_params={
+            'provider_id': '$provider_network_provider',
+        },
         required=False
     )
+    provider_network_provider = DynamicModelChoiceField(
+        queryset=Provider.objects.all(),  # See if we can expose circuit_count to Providers filter, and only show the Providers that have a Networks
+        required=False,
+        # initial_params={
+        #     'provider_id': '$provider_network.provider'  # How can we pre-select the provider of the 'selected' item ?
+        # }
+    )
 
     class Meta:
         model = CircuitTermination
         fields = [
-            'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network', 'mark_connected',
+            'provider', 'circuit', 'term_side', 'region', 'site_group', 'site', 'provider_network_provider', 'provider_network', 'mark_connected',
             'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags',
         ]
         help_texts = {
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 5196eddf2..6c3d2754c 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -7,7 +7,7 @@
     <div class="row mb-2">
       <h5 class="offset-sm-3">Circuit Termination</h5>
     </div>
-    {% render_field form.provider %}
+    {% render_field form.provider label="Circuit Provider" %}
     {% render_field form.circuit %}
     {% render_field form.term_side %}
     {% render_field form.tags %}
@@ -32,6 +32,7 @@
           {% render_field form.site %}
         </div>
         <div class="tab-pane{% if providernetwork_tab_active %} active{% endif %}" id="providernetwork">
+          {% render_field form.provider_network_provider label="Provider" %}
           {% render_field form.provider_network %}
         </div>
       </div>
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index f4e0ea6ca..160ff940f 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -81,7 +81,7 @@
           {% else %}
             <tr>
               <td>Provider Network</td>
-              <td>{{ termination.provider_network|linkify }}</td>
+              <td>{{ termination.provider_network.provider|linkify }} / {{ termination.provider_network|linkify }}</td>
             </tr>
           {% endif %}
             <tr>