diff --git a/openstack-dashboard/dashboard/templates/_service_toggle_enabled.html b/openstack-dashboard/dashboard/templates/_service_toggle_enabled.html
index 868fc340b..e22fda150 100644
--- a/openstack-dashboard/dashboard/templates/_service_toggle_enabled.html
+++ b/openstack-dashboard/dashboard/templates/_service_toggle_enabled.html
@@ -1,14 +1,4 @@
-{% if service.enabled %}               
-  <form id="form_service_disable_{{service.id}}" class="form-service-disable" method="post">
-    {% csrf_token %}
-    {% for hidden in form.hidden_fields %}
-      {{hidden}}
-    {% endfor %}
-    <input name="service" type="hidden" value="{{service.id}}" />
-    <input name="name" type="hidden" value="{{service.type}}" />
-    <input id="disable_{{service.id}}" class="disable" type="submit" value="Disable" />
-  </form>
-{% else %}
+{% if service.disabled %}               
   <form id="form_service_enable_{{service.id}}" class="form-service-enable" method="post">
     {% csrf_token %}
     {% for hidden in form.hidden_fields %}
@@ -18,4 +8,14 @@
     <input name="name" type="hidden" value="{{service.type}}" />
     <input id="enable_{{service.id}}" class="enable" type="submit" value="Enable" />
   </form>
+{% else %}
+  <form id="form_service_disable_{{service.id}}" class="form-service-disable" method="post">
+    {% csrf_token %}
+    {% for hidden in form.hidden_fields %}
+      {{hidden}}
+    {% endfor %}
+    <input name="service" type="hidden" value="{{service.id}}" />
+    <input name="name" type="hidden" value="{{service.type}}" />
+    <input id="disable_{{service.id}}" class="disable" type="submit" value="Disable" />
+  </form>
 {% endif %}
diff --git a/openstack-dashboard/dashboard/templates/_syspanel_service_list.html b/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
index 26e2d361e..eaafe68ee 100644
--- a/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
+++ b/openstack-dashboard/dashboard/templates/_syspanel_service_list.html
@@ -11,7 +11,7 @@
     <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
       <td>{{service.host}}</td>
       <td>{{service.type}}</td>
-      <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
+      <td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
       <td>{{service.up}}</td>
       <td id="actions">
         <ul>
@@ -24,7 +24,7 @@
     <tr class='{{service.up|yesno:"good,bad"}} {{service.disabled|yesno:"medium,"}} {% cycle 'odd' 'even' %}'>
       <td>{{service.host}}</td>
       <td>{{service.type}}</td>
-      <td>{{service.disabled|yesno:"Enabled,Disabled"}}</td>
+      <td>{{service.disabled|yesno:"Disabled,Enabled"}}</td>
       <td>{{service.up}}</td>
       <td></td>
     </tr>