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 2421194d09..b83db38ab2 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
@@ -10,12 +10,13 @@
 		<small>{{user.email}}</small>
 	</div>
 	
+
 	<div class="umb-panel-body umb-scrollable" auto-scale="1">
 		<div class="tab-content umb-control-group">
 			<h5>Your profile</h5>
 			
 			<p>
-				<a href="#/framed/umbraco/users/edituser.asp?id={{user.id}}" class="btn btn-primary">Edit your profile</a>
+				<a href="#/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}" class="btn btn-primary">Edit your profile</a>
 			</p>
 
 			<hr />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
index e1f57b62d0..59133d55c9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
@@ -22,6 +22,8 @@ namespace umbraco.cms.presentation
     /// <summary>
     /// Summary description for dashboard.
     /// </summary>
+    /// 
+    
     public partial class dashboard : BasePages.UmbracoEnsuredPage
     {
 
@@ -31,7 +33,7 @@ namespace umbraco.cms.presentation
         protected void Page_Load(object sender, System.EventArgs e)
         {
             // Put user code to initialize the page here
-            Panel2.Text = ui.Text("dashboard", "welcome", base.getUser()) + " " + this.getUser().Name;
+            Panel2.Text = ui.Text("dashboard", "welcome", UmbracoUser) + " " + UmbracoUser.Name;
         }
 
         private Control CreateDashBoardWrapperControl(Control control)