diff --git a/app/views/users/passwords/edit.html.erb b/app/views/users/passwords/edit.html.erb
index 4c51752..c8a67ce 100644
--- a/app/views/users/passwords/edit.html.erb
+++ b/app/views/users/passwords/edit.html.erb
@@ -1,6 +1,4 @@
-<div class="page-header">
-  <h1>Change your password</h1>
-</div>
+<%= render :partial => "users/shared/links" %>
 
 <%= simple_form_for(resource,
     as: resource_name,
@@ -16,5 +14,3 @@
 
   <%= f.submit "Change my password", class: 'btn btn-primary' %>
 <% end %>
-
-<%= render :partial => "users/shared/links" %>
diff --git a/app/views/users/shared/_links.erb b/app/views/users/shared/_links.erb
index 3bfc1a2..cde93bd 100644
--- a/app/views/users/shared/_links.erb
+++ b/app/views/users/shared/_links.erb
@@ -2,8 +2,9 @@
 <% semantic_navigation :devise_nav, html: { class: 'nav nav-tabs' } do |n| %>
   <%= n.item "Sign in", link: new_session_path(resource_name) %>
   <%= n.item "Sign up", link: new_registration_path(resource_name) %>
-  <%= n.item "Forgot your password?", link: new_password_path(resource_name) %>
+  <%= n.item "Forgot your password?", link: new_password_path(resource_name),
+    highlights_on: [{ controller: 'devise/passwords' }] %>
   <%= n.item "Didn't receive confirmation instructions?", link: new_confirmation_path(resource_name) %>
   <%= n.item "Didn't receive unlock instructions?", link: new_unlock_path(resource_name) %>
 <% end %>
-</br>
\ No newline at end of file
+</br>