diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb
index 0e6559bfb..e97c0d9c4 100644
--- a/app/views/users/_secondary_links.html.erb
+++ b/app/views/users/_secondary_links.html.erb
@@ -4,32 +4,31 @@
     <li><%= link_to "Listing", users_path %></li>
     <li><%= link_to "Search", search_users_path %></li>
 
-    <% if CurrentUser.is_anonymous? %>
+    <% if CurrentUser.user.is_anonymous? %>
       <li><%= link_to "Sign up", new_user_path %></li>
     <% end %>
 
-    <% if @user && !@user.new_record? && !CurrentUser.is_anonymous? %>
+    <% if @user && !@user.new_record? && !CurrentUser.user.is_anonymous? %>
       <li>|</li>
-      <% if @user.id == CurrentUser.id %>
+      <% if @user.id == CurrentUser.user.id %>
         <li><%= link_to "Settings", edit_user_path(CurrentUser.user) %></li>
         <% if @user.is_gold? %>
           <li><%= link_to "Edit subscriptions", tag_subscriptions_path %></li>
         <% end %>
         <li><%= link_to "Profile", user_path(CurrentUser.user) %></li>
-        <li><%= link_to "Messages #{CurrentUser.dmail_count}", dmails_current_folder_path %></li>
+        <li><%= link_to "Messages #{CurrentUser.user.dmail_count}", dmails_current_folder_path %></li>
+
+        <% if !@user.is_platinum? %>
+          <li><%= link_to "Upgrade", new_user_upgrade_path %></li>
+        <% end %>
       <% else %>
         <li><%= link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %></li>
-      <% end %>
-
-      <% if CurrentUser.is_member? || CurrentUser.is_gold? %>
-        <% if @user.id == CurrentUser.user.id %>
-          <li><%= link_to "Upgrade", new_user_upgrade_path %></li>
-        <% else %>
-          <li><%= link_to "Gift Upgrade", new_user_upgrade_path(:user_id => @user.id) %></li>
+        <% if !@user.is_platinum? %>
+          <li><%= link_to "Gift upgrade", new_user_upgrade_path(:user_id => @user.id) %></li>
         <% end %>
       <% end %>
 
-      <% if CurrentUser.is_moderator? %>
+      <% if CurrentUser.user.is_moderator? %>
         <li><%= link_to "Promote", edit_admin_user_path(@user) %></li>
         <% if @user.is_banned? %>
           <li><%= link_to "Unban", ban_path(@user.recent_ban) %></li>