diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index fb2dddd72c..404abbab1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -55,11 +55,25 @@ angular.module('umbraco')
 		};
 
 		$scope.clear = function() {
-			$scope.model.value.id = undefined;
-			$scope.node = undefined;
-			$scope.model.value.query = undefined;
+			$scope.model.value.id = null;
+            $scope.node = null;
+            $scope.model.value.query = null;
 		};
 		
+
+		//we always need to ensure we dont submit anything broken
+	    var unsubscribe = $scope.$on("formSubmitting", function (ev, args) {
+	    	if($scope.model.value.type === "member"){
+	    		$scope.model.value.id = null;
+	    		$scope.model.value.query = "";
+	    	}
+	    });
+
+	    //when the scope is destroyed we need to unsubscribe
+	    $scope.$on('$destroy', function () {
+	        unsubscribe();
+	    });
+
 		function populate(item){
 			$scope.clear();
 			item.icon = iconHelper.convertFromLegacyIcon(item.icon);