diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
index f8629dc6cd..03dfbe895f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
@@ -12,23 +12,33 @@ angular.module("umbraco").controller("Umbraco.Dialogs.LinkPickerController",
 
 		eventsService.publish("Umbraco.Dialogs.LinkPickerController.Select", args).then(function(args){
 				var c = $(args.event.target.parentElement);
+
+				//clearing
 				if($scope.selectedEl){
 					$scope.selectedEl.find(".temporary").remove();
 					$scope.selectedEl.find("i.umb-tree-icon").show();
 				}
 
-				c.find("i.umb-tree-icon")
-				 .hide()
-				 .after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
-				
-				$scope.selectedEl = c;
-				$scope.target = args.node;
-				$scope.target.title = args.node.name;
+				//renewing
+				if(c !== $scope.selectedEl){
+					c.find("i.umb-tree-icon")
+					 .hide()
+					 .after("<i class='icon umb-tree-icon sprTree icon-check blue temporary'></i>");
+					
+					$scope.selectedEl = c;
 
-				if(args.node.id < 0){
-					$scope.target.url = "/";
+					$scope.target = args.node;
+					$scope.target.title = args.node.name;
+
+					if(args.node.id < 0){
+						$scope.target.url = "/";
+					}else{
+						$scope.target.url = contentResource.getNiceUrl(args.node.id);
+					}
 				}else{
-					$scope.target.url = contentResource.getNiceUrl(args.node.id);
+					//resetting
+					$scope.selectedEl = null;
+					$scope.target = {};
 				}
 		});
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index ff471b6a43..e09ec82315 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -5,7 +5,9 @@
 				<input type="text" 
 					placeholder="Enter url" 
 					class="umb-editor umb-textstring" 
-					ng-model="target.url" />
+					ng-model="target.url"
+					ng-disabled="target.id"
+					 />
 			</umb-control-group>
 			<umb-control-group label="Title">
 				<input type="text" 
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 38edb70afb..27b1333375 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -623,6 +623,7 @@
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
     <Content Include="Config\appSettings.Release.config" />
+    <Content Include="Config\appSettings.config" />
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -634,6 +635,7 @@
       <DependentUpon>BaseRestExtensions.config</DependentUpon>
     </None>
     <Content Include="Config\connectionStrings.Release.config" />
+    <Content Include="Config\connectionStrings.config" />
     <None Include="Config\log4net.Release.config">
       <DependentUpon>log4net.config</DependentUpon>
     </None>
diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config
index d0e094966b..a32b015367 100644
--- a/src/Umbraco.Web.UI/config/ClientDependency.config
+++ b/src/Umbraco.Web.UI/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="22" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="23" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 042713938f..e6730cc227 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -116,7 +116,8 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         public string GetNiceUrl(int id)
         {
-            return Umbraco.NiceUrl(id);
+            var url = Umbraco.NiceUrl(id);
+            return url;
         }
 
         /// <summary>