diff --git a/lms/templates/accordion.html b/lms/templates/accordion.html
index d8ca925b79..7f67f784ad 100644
--- a/lms/templates/accordion.html
+++ b/lms/templates/accordion.html
@@ -8,7 +8,7 @@
     <ul>
       % for section in chapter['sections']:
         <li${' class="active"' if 'active' in section and section['active'] else ''}>
-          <a href="${ MITX_ROOT_URL}${reverse('courseware_section', args=format_url_params([course_name, chapter['name'], section['name']]))}">
+          <a href="${ MITX_ROOT_URL}${reverse('courseware_section', args=[course_id] + format_url_params([chapter['name'], section['name']]))}">
             <p>${section['name']}
             <span class="subtitle">
               ${section['format']} ${"due " + section['due'] if 'due' in section and section['due'] != '' else ''}
diff --git a/lms/templates/course_navigation.html b/lms/templates/course_navigation.html
index 4e8be9a801..2cffc36707 100644
--- a/lms/templates/course_navigation.html
+++ b/lms/templates/course_navigation.html
@@ -17,7 +17,7 @@ def url_class(url):
       <li class="info"><a href="${reverse('info', args=[course.id])}" class="${url_class('info')}">Course Info</a></li>
 % if user.is_authenticated():
       <li class="book"><a href="${reverse('book', args=[course.id])}" class="${url_class('book')}">Textbook</a></li>
-      <li class="discussion"><a href="${ MITX_ROOT_URL }/discussion/questions/">Discussion</a></li>
+      <li class="discussion"><a href="${reverse('questions')}">Discussion</a></li>
 % endif
       <li class="wiki"><a href="${reverse('wiki_root')}" class="${url_class('wiki')}">Wiki</a></li>
 % if user.is_authenticated():