diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
index d84bb8e24d..a94170d675 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbproperty.directive.js
@@ -13,14 +13,16 @@ angular.module("umbraco.directives")
             restrict: 'E',
             replace: true,        
             templateUrl: 'views/directives/umb-property.html',
-
+            link: function(scope) {
+                scope.propertyAlias = Umbraco.Sys.ServerVariables.isDebuggingEnabled === true ? scope.property.alias : null;
+            },
             //Define a controller for this directive to expose APIs to other directives
             controller: function ($scope, $timeout) {
                
                 var self = this;
 
                 //set the API properties/methods
-
+                
                 self.property = $scope.property;
                 self.setPropertyError = function(errorMsg) {
                     $scope.property.propertyErrorMessage = errorMsg;
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
index c6fddded8c..32d55c3c90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-property.html
@@ -5,7 +5,7 @@
             <val-property-msg property="property"></val-property-msg>
             
             <div class="umb-el-wrap">
-                <label class="control-label" ng-hide="property.hideLabel" for="{{property.alias}}" title="{{property.alias}}">
+                <label class="control-label" ng-hide="property.hideLabel" for="{{property.alias}}" ng-attr-title="{{propertyAlias}}">
                     {{property.label}}
                     <small ng-bind-html="property.description"></small>
                 </label>
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 689f859462..203d027539 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -349,7 +349,9 @@ namespace Umbraco.Web.Editors
                             {"trees", GetTreePluginsMetaData()}
                         }
                     },
-                    {"isDebuggingEnabled", HttpContext.IsDebuggingEnabled},
+                    {
+                        "isDebuggingEnabled", HttpContext.IsDebuggingEnabled
+                    },
                     {
                         "application", GetApplicationState()
                     },