diff --git a/templates/corporate/support/current_plan_forms_support.html b/templates/corporate/support/current_plan_forms_support.html
index 29919498f5..d937e6dbe8 100644
--- a/templates/corporate/support/current_plan_forms_support.html
+++ b/templates/corporate/support/current_plan_forms_support.html
@@ -1,4 +1,4 @@
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Billing collection method</b><br />
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
@@ -10,7 +10,7 @@
 </form>
 
 {% if current_plan.status == current_plan.ACTIVE %}
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Plan end date</b><br />
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
@@ -20,7 +20,7 @@
 </form>
 {% endif %}
 
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Modify current plan</b><br />
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
diff --git a/templates/corporate/support/next_plan_forms_support.html b/templates/corporate/support/next_plan_forms_support.html
index 4efbaef627..e9f48d8d5f 100644
--- a/templates/corporate/support/next_plan_forms_support.html
+++ b/templates/corporate/support/next_plan_forms_support.html
@@ -1,5 +1,5 @@
 <p class="support-section-header">⏱️ Schedule plan:</p>
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Configure fixed price plan:</b><br />
     {% if not plan_data.is_current_plan_billable %}
     <i>Enter Invoice ID only if the customer chose to pay by invoice.</i><br />
@@ -13,7 +13,7 @@
     <button type="submit" class="support-submit-button">Schedule</button>
 </form>
 {% if not plan_data.current_plan %}
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Configure temporary courtesy plan:</b><br />
     <i>Once created, the end date for the temporary courtesy plan can be extended.</i><br />
     {{ csrf_input }}
diff --git a/templates/corporate/support/sponsorship_discount_forms.html b/templates/corporate/support/sponsorship_discount_forms.html
index 65e4e00e5f..d542459945 100644
--- a/templates/corporate/support/sponsorship_discount_forms.html
+++ b/templates/corporate/support/sponsorship_discount_forms.html
@@ -1,4 +1,4 @@
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Required plan tier for discounts and fixed prices</b>:<br />
     <i>Updates will not change any pre-existing plans or scheduled upgrades.</i><br />
     {{ csrf_input }}
@@ -15,7 +15,7 @@
     <button type="submit" class="support-submit-button">Update</button>
 </form>
 
-<form method="POST" class="remote-form discounted-price-form">
+<form method="POST" class="discounted-price-form support-form">
     <b>Discounted price <i class="fa fa-question-circle-o" data-tippy-content="
         Needs required plan tier to be set.<br />
         Default price for tier will be used if discounted price for the schedule is not specified or is 0.<br />
@@ -51,7 +51,7 @@
 </form>
 
 {% if not has_fixed_price and (sponsorship_data.monthly_discounted_price or sponsorship_data.annual_discounted_price or sponsorship_data.minimum_licenses) %}
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Minimum licenses</b>:<br />
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
diff --git a/templates/corporate/support/sponsorship_forms_support.html b/templates/corporate/support/sponsorship_forms_support.html
index 67da5e8530..63a7305bfd 100644
--- a/templates/corporate/support/sponsorship_forms_support.html
+++ b/templates/corporate/support/sponsorship_forms_support.html
@@ -1,4 +1,4 @@
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     <b>Sponsorship pending</b>:<br />
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
@@ -10,7 +10,7 @@
 </form>
 
 {% if sponsorship_data.sponsorship_pending %}
-<form method="POST" class="remote-form">
+<form method="POST" class="support-form">
     {{ csrf_input }}
     <input type="hidden" name="{{ remote_type }}" value="{{ remote_id }}" />
     <input type="hidden" name="approve_sponsorship" value="true" />
diff --git a/web/styles/portico/activity.css b/web/styles/portico/activity.css
index f32612b10b..74f66a4967 100644
--- a/web/styles/portico/activity.css
+++ b/web/styles/portico/activity.css
@@ -334,14 +334,6 @@ tr.admin td:first-child {
     text-align: center;
 }
 
-.reactivate-remote-server-form,
-.deactivate-remote-server-form,
-.realm-support-information,
-.remote-server-information,
-.remote-realm-information {
-    margin-bottom: 10px;
-}
-
 .support-section-header {
     font-size: 1.2em;
     font-weight: bold;
@@ -356,9 +348,13 @@ tr.admin td:first-child {
     top: -2px;
 }
 
+.reactivate-remote-server-form,
+.deactivate-remote-server-form,
+.realm-support-information,
+.remote-server-information,
+.remote-realm-information,
 .remote-sponsorship-details,
 .support-form,
-.remote-form,
 .next-plan-information,
 .current-plan-information {
     margin-bottom: 10px;