diff --git a/code/control/Users_Account_Controller.php b/code/control/Users_Account_Controller.php
index 95d9591..5ba3ea3 100755
--- a/code/control/Users_Account_Controller.php
+++ b/code/control/Users_Account_Controller.php
@@ -160,23 +160,28 @@ public function ChangePasswordForm() {
      */
     public function getAccountMenu() {
         $menu = new ArrayList();
+        
+        $curr_action = $this->request->param("Action");
 
         $menu->add(new ArrayData(array(
             "ID"    => 0,
             "Title" => _t('Users.PROFILESUMMARY',"Profile Summary"),
-            "Link"  => $this->Link()
+            "Link"  => $this->Link(),
+            "LinkingMode" => (!$curr_action) ? "current" : "link"
         )));
 
         $menu->add(new ArrayData(array(
             "ID"    => 10,
             "Title" => _t('Users.EDITDETAILS',"Edit account details"),
-            "Link"  => $this->Link("edit")
+            "Link"  => $this->Link("edit"),
+            "LinkingMode" => ($curr_action == "edit") ? "current" : "link"
         )));
 
         $menu->add(new ArrayData(array(
             "ID"    => 30,
             "Title" => _t('Users.CHANGEPASSWORD',"Change password"),
-            "Link"  => $this->Link("changepassword")
+            "Link"  => $this->Link("changepassword"),
+            "LinkingMode" => ($curr_action == "changepassword") ? "current" : "link"
         )));
 
         $this->extend("updateAccountMenu", $menu);
diff --git a/templates/Includes/Users_Profile_SideBar.ss b/templates/Includes/Users_Profile_SideBar.ss
index 3b48b30..08a5c9a 100755
--- a/templates/Includes/Users_Profile_SideBar.ss
+++ b/templates/Includes/Users_Profile_SideBar.ss
@@ -3,7 +3,7 @@
         <ul>
             <% loop $AccountMenu %>
                 <li>
-                    <a href="$Link">
+                    <a href="$Link" class="$LinkingMode">
                         <span class="arrow">&rarr;</span>
                         <span class="text">$Title</span>
                     </a>