diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index d470da9..c02065b 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -219,7 +219,7 @@ class Admin::MembersController < OrbitMemberController
 
   def edit_passwd
     @user = @member.user
-    if current_user.id == @user.id
+    unless current_user.id == @user.id or current_user.is_admin?
       redirect_to :action => :index
     end
   end
diff --git a/app/views/layouts/_right_menu.html.erb b/app/views/layouts/_right_menu.html.erb
index b9325cc..ea51725 100644
--- a/app/views/layouts/_right_menu.html.erb
+++ b/app/views/layouts/_right_menu.html.erb
@@ -35,11 +35,9 @@
           <% end %>          
         </a>
         <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
-          <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t("users.change_passwd"), tabindex: '-1' %></li>
-          <li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' +  t("users.user_basic_data"), tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
+          <li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' +  t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
           <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), logout_path, tabindex: '-1' %></li>
-          <li class="divider"></li>
-          <li><a tabindex="-1" href="#"><i class="icons-lifebuoy"></i> <%= t(:help) %></a></li>
         </ul>
       </li>
     <% else %>