diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index 3b6b9a100..d5cb4a8b0 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -1,12 +1,10 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", users_path %></li>
-    <% if @user && !@user.new_record? %>
+    <% unless CurrentUser.is_anonymous? %>
       <li>|</li>
-      <li><%= link_to "Settings", edit_user_path(@user) %></li>
-      <li><%= link_to "Profile", user_path(@user) %></li>
-    <% end %>
-    <% unless CurrentUser.user.is_anonymous? %>
+      <li><%= link_to "Settings", edit_user_path(CurrentUser.user) %></li>
+      <li><%= link_to "Profile", user_path(CurrentUser.user) %></li>
       <li>|</li>
       <li><%= link_to "Sign out", session_path, :method => :delete %></li>
     <% end %>