diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
index 86b1f153f..d8e49f6de 100644
--- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
+++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.html
@@ -3,7 +3,9 @@
         <div id="userAccountMenu" class="row-fluid">
             <div class="list-group panel">
                 <a href="#userMenu" class="list-group-item" id="userName" data-toggle="collapse" data-parent="#userAccountMenu">{{fullName}} <span class="caret"></span></a>
+
                 <div class="collapse pos-absolute" id="userMenu">
+
                     {{#if showWorklistMenu}}
                         <a href="worklist" id="worklist" data-toggle="collapse" data-target="#userMenu" class="list-group-item sub-item">
                             <i class="fa fa-list-ul"></i> Worklist
@@ -15,14 +17,17 @@
                             <i class="fa fa-list-ul"></i> View Audit Log
                         </a>
                     {{/if}}
+
                     <a href="#itemSettings" class="list-group-item sub-item" data-toggle="collapse" data-parent="#itemSettings"><i class="fa fa-cog fa-lg"></i> Settings <span class="caret"></span></a>
                     <div class="collapse list-group-submenu" id="itemSettings">
-                        <a href="#" id="serverInformation" class="list-group-item sub-sub-item" data-parent="#itemSettings" data-toggle="collapse" data-target="#userMenu"><i class="fa fa-server fa-lg"></i> Server Information</a>
+                        <a href="#" id="serverInformation" class="list-group-item sub-sub-item" data-parent="#itemSettings" data-toggle="collapse" data-target="#itemSettings,#userMenu"><i class="fa fa-server fa-lg"></i> Server Information</a>
                     </div>
+
                     <a href="#itemProfile" class="list-group-item sub-item" data-toggle="collapse" data-parent="#itemProfile" ><i class="fa fa-user fa-lg"></i> Profile <span class="caret"></span></a>
                     <div class="collapse list-group-submenu" id="itemProfile">
-                        <a href="changePassword" id="changePassword" class="list-group-item sub-sub-item" data-parent="#itemProfile" data-toggle="collapse" data-target="#userMenu"><i class="fa fa-lock"></i> Change Password</a>
+                        <a href="changePassword" id="changePassword" class="list-group-item sub-sub-item" data-parent="#itemProfile" data-toggle="collapse" data-target="#itemProfile,#userMenu"><i class="fa fa-lock"></i> Change Password</a>
                     </div>
+
                     <a href="#" id="logoutButton" data-toggle="collapse" data-target="#userMenu" class="list-group-item sub-item">
                         <i class="fa fa-power-off"></i> Logout
                     </a>
diff --git a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
index 8968307d8..25fcf3671 100644
--- a/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
+++ b/Packages/lesiontracker/client/components/userAccountMenu/userAccountMenu.js
@@ -50,5 +50,8 @@ Template.userAccountMenu.events({
     },
     'click #audit': function(e, template) {
         template.showWorklistMenu.set(true);
+    },
+    'click #changePassword': function(e, template) {
+        template.showWorklistMenu.set(true);
     }
 });
\ No newline at end of file