diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
index 8346acfabb..afd836538a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
@@ -18,18 +18,25 @@
 
     <div class="umb-panel-body umb-scrollable">
         <div class="tab-content umb-control-group">
-
-            <div class="umb-pane" ng-if="canEditProfile">
+            
+ 
+            <div class="umb-pane">
                 <h5><localize key="user_yourProfile" /></h5>
                 <p>
                     <a href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
                        class="btn btn-primary"
-                       ng-click="close()">
+                       ng-click="close()" ng-if="canEditProfile">
                         <localize key="general_edit">Edit</localize>
                     </a>
+                    <a href
+                       class="btn"
+                       ng-click="showChangePassword = showChangePassword === true ? false : true;" ng-init="showChangePassword = false;">
+                        <localize key="user_newPassword">Change password</localize>
+                    </a>
                 </p>
             </div>
 
+
             <div class="umb-pane external-logins" ng-if="externalLoginProviders.length > 0">
 
                 <h5>External login providers</h5>
@@ -53,7 +60,7 @@
                             ng-click="unlink($event, login.authType, login.linkedProviderKey)"
                             class="btn btn-block btn-social"
                             ng-class="login.properties.SocialStyle"
-                            id="{{login.authType}}"
+                            id="Button1"
                             name="provider"
                             value="{{login.authType}}">
                         <i class="fa" ng-class="login.properties.SocialIcon"></i>
@@ -63,6 +70,24 @@
 
             </div>
 
+            <div class="umb-pane" ng-if="showChangePassword">
+                <form novalidate name="passwordForm"
+                    ng-controller="Umbraco.Dashboard.StartupChangePasswordController"
+                    ng-submit="changePassword()"
+                    val-form-manager>
+
+                    <h3><localize key="user_changePassword">Change password</localize></h3>
+    
+                    <umb-editor model="changePasswordModel"></umb-editor>   
+        
+                    <umb-control-group hideLabel="1">
+                        <button class="btn btn-primary"><localize key="user_change">Change</localize></button>
+                        <!-- Could not get the button to change the showChangePassword scope variable to hide the form again... -->
+                        <!--<button class="btn"><localize key="general_cancel" ng-click="showChangePassword = false;">Cancel</localize></button>-->
+                    </umb-control-group>			
+                </form>
+            </div>
+
             <div class="umb-pane">
                 <h5><localize key="user_yourHistory" /></h5>
                 <ul class="umb-tree">
@@ -78,4 +103,4 @@
 
         <small class="umb-version">Umbraco version {{version}}</small>
     </div>
-</div>
\ No newline at end of file
+</div>