diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 6f91d01..3438aae 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -41,18 +41,18 @@
             </a>
           </li>
         <% else %>
-          <li <%= 'class=active' if isActivePage(root_path) || isActivePage(plans_path) %>>
+          <li <%= 'class=active' if isActivePage(root_path, true) || isActivePage(plans_path, true) %>>
             <%= link_to _('Home'), root_path %>
           </li>
-          <li <%= 'class=active' if isActivePage(public_plans_path) %>>
+          <li <%= 'class=active' if isActivePage(public_plans_path, true) %>>
             <%= link_to _('Public DMPs'), public_plans_path %>
           </li>
-          <li <%= 'class=active' if isActivePage(public_templates_path) %>>
+          <li <%= 'class=active' if isActivePage(public_templates_path, true) %>>
             <%= link_to _('DMP Templates'), public_templates_path %>
           </li>
         <% end %>
         <!-- help page -->
-        <li <%= 'class=active' if isActivePage(help_path) %>>
+        <li <%= 'class=active' if isActivePage(help_path, true) %>>
           <%= link_to _('Help'), help_path %>
         </li>
       </ul>
@@ -60,7 +60,7 @@
           <%= render "layouts/signin_signout" %>
       </ul>
 
-      <% unless isActivePage(root_path) %>
+      <% unless isActivePage(root_path, true) %>
         <%= render partial: 'shared/access_controls', layout: 'shared/modal', locals: { id: "header-signin", title: _('Sign in')} %>
       <% end %>
     </div><!-- /.navbar-collapse -->
diff --git a/app/views/layouts/_signin_signout.html.erb b/app/views/layouts/_signin_signout.html.erb
index a8b148e..6bacdc2 100644
--- a/app/views/layouts/_signin_signout.html.erb
+++ b/app/views/layouts/_signin_signout.html.erb
@@ -34,7 +34,7 @@
     </ul>
   </li>
 <% else %>
-  <% if !isActivePage(root_path) %>
+  <% if !isActivePage(root_path, true) %>
     <li>
       <a href="#header-signin" data-toggle="modal" data-target="#header-signin">
         <i class="fa fa-sign-in" aria-hidden="true">&nbsp;</i>