diff --git a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
index 28ac072ea6..ff54c5c222 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
@@ -242,18 +242,19 @@ angular.module('umbraco.services')
 
                 _.each(assets, function (asset) {
                     LazyLoad.js(appendRnd(asset.path), function () {
+                        asset.state = "loaded";
                         if (!scope) {
-                            asset.state = "loaded";
                             asset.deferred.resolve(true);
-                        } else {
-                            asset.state = "loaded";
+                        }
+                        else {
                             angularHelper.safeApply(scope, function () {
                                 asset.deferred.resolve(true);
                             });
                         }
                     });
                 });
-            } else {
+            }
+            else {
                 //return and resolve
                 var deferred = $q.defer();
                 promise = deferred.promise;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index ddf20adb19..d31ac911a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -9,7 +9,7 @@
         assetsService.load([
             //"lib/spectrum/tinycolor.js",
             "lib/spectrum/spectrum.js"          
-        ]).then(function () {
+        ], $scope).then(function () {
             var elem = $element.find("input");
             elem.spectrum({
                 color: null,
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
index ccf8e0a882..fe413e0159 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
@@ -43,12 +43,7 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
             if (e.date && e.date.isValid()) {
                 $scope.datePickerForm.datepicker.$setValidity("pickerError", true);
                 $scope.hasDatetimePickerValue = true;
-                if (!$scope.model.config.format) {
-                    $scope.datetimePickerValue = e.date;
-                }
-                else {
-                    $scope.datetimePickerValue = e.date.format($scope.model.config.format);
-                }
+                $scope.datetimePickerValue = e.date.format($scope.model.config.format);
             }
             else {
                 $scope.hasDatetimePickerValue = false;
@@ -82,8 +77,8 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
 		$scope.model.config.language = user.locale;
 		
 
-		assetsService.load(filesToLoad).then(
-			function () {
+		assetsService.load(filesToLoad, $scope).then(
+            function () {
 				//The Datepicker js and css files are available and all components are ready to use.
 
 				// Get the id of the datepicker button that was clicked
@@ -102,15 +97,10 @@ function dateTimePickerController($scope, notificationsService, assetsService, a
 
 			    if ($scope.hasDatetimePickerValue) {
 
-                    //assign value to plugin/picker
-			        element.datetimepicker("setValue", $scope.model.value ? new Date($scope.model.value) : moment());
-
-			        if (!$scope.model.config.format) {
-			            $scope.datetimePickerValue = moment($scope.model.value);
-			        }
-			        else {
-			            $scope.datetimePickerValue = moment($scope.model.value).format($scope.model.config.format);
-			        }
+			        //assign value to plugin/picker
+			        var dateVal = $scope.model.value ? moment($scope.model.value, $scope.model.config.format) : moment();
+			        element.datetimepicker("setValue", dateVal);
+			        $scope.datetimePickerValue = moment($scope.model.value).format($scope.model.config.format);
 			    }
 
 			    element.find("input").bind("blur", function() {