diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index f9ed2a4..97e336e 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -82,10 +82,11 @@
             </div>
         {% endif %}
     </div>
-    {% if form and expert_form %}
+    {% if expert_form %}
         <div id="expert-form-container"
              class="expert-crd-form"
-             style="display:none">
+             style="{% if form %}display:none{% endif %}">
+            {% if expert_form and expert_form.context %}{{ expert_form.context }}{% endif %}
             <ul class="nav nav-tabs" id="expertTab" role="tablist">
                 {% for fieldset in expert_form.get_fieldsets %}
                     {% if not fieldset.hidden %}