diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 3fe3618393..bf37186c63 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -177,11 +177,11 @@
         {% if form_navigation_links %}
             <div class="secondary-navigation">
                 <ul class="wat-cf">
+                        {% with form_navigation_links as object_navigation_links %}
                         {% with "true" as as_li %}
                         {% with "true" as hide_active_anchor %}
                         {% with "active" as li_class_active %}
                         {% with "first" as li_class_first %}
-                        {% with form_navigation_links as object_navigation_links %}
                             {% include "generic_navigation.html" %}
                         {% endwith %}
                         {% endwith %}
diff --git a/apps/navigation/templates/generic_subnavigation.html b/apps/navigation/templates/generic_subnavigation.html
index cbec99284b..cb2fcaac0b 100644
--- a/apps/navigation/templates/generic_subnavigation.html
+++ b/apps/navigation/templates/generic_subnavigation.html
@@ -9,7 +9,7 @@
         {% evaluate_link condition as conditional_display %}
         {% if conditional_display %}
             {% if as_li %}
-                <li class="{% if link.first and li_class_first %}{{ li_class_first}} {% endif %}{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
+                <li class="{% if forloop.first and li_class_first %}{{ li_class_first}} {% endif %}{% if link.active and li_class_active %}{{ li_class_active }}{% endif %}">
             {% endif %}
                 {% include "generic_link_instance.html" %}
             {% if as_li %}</li>{% endif %}    
diff --git a/apps/navigation/templatetags/navigation_tags.py b/apps/navigation/templatetags/navigation_tags.py
index c89ac3f8de..d8ccfd209b 100644
--- a/apps/navigation/templatetags/navigation_tags.py
+++ b/apps/navigation/templatetags/navigation_tags.py
@@ -26,7 +26,8 @@ def process_links(links, view_name, url):
     """
     items = []
     active_item = None
-    for item, count in zip(links, range(len(links))):
+    #for item, count in zip(links, range(len(links))):
+    for item in links:
         item_view = 'view' in item and item['view']
         item_url = 'url' in item and item['url']
         new_link = item.copy()
@@ -42,7 +43,6 @@ def process_links(links, view_name, url):
                     if view_name == child_view or url == child_url:
                         active_item = item
         new_link.update({
-            'first': count == 0,
             'url': item_view and reverse(item_view) or item_url or u'#',
             })
         items.append(new_link)