diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 4f2a106236..80d7d9366b 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -42,7 +42,12 @@
       "codemirror"
     ],
     "sources": {
-      "moment": "bower_components/moment/min/moment-with-locales.js",
+      "moment": [
+          "bower_components/moment/min/moment.min.js",
+          "bower_components/moment/min/moment-with-locales.js",
+          "bower_components/moment/min/moment-with-locales.min.js",
+          "bower_components/moment/locale/*.js"
+        ],
       "underscore": [
         "bower_components/underscore/underscore-min.js",
         "bower_components/underscore/underscore-min.map"
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
index f20c3df44f..12d7a75a77 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/user.service.js
@@ -1,5 +1,5 @@
 angular.module('umbraco.services')
-  .factory('userService', function ($rootScope, eventsService, $q, $location, $log, securityRetryQueue, authResource, dialogService, $timeout, angularHelper, $http) {
+  .factory('userService', function ($rootScope, eventsService, $q, $location, $log, securityRetryQueue, authResource, assetsService, dialogService, $timeout, angularHelper, $http) {
 
     var currentUser = null;
     var lastUserId = null;
@@ -276,6 +276,30 @@ angular.module('umbraco.services')
         return deferred.promise;
       },
 
+      /** Loads the Moment.js Locale for the current user. */
+      loadMomentLocaleForCurrentUser: function () {
+        var deferred = $q.defer();
+
+        var supportedLocales = [];
+
+        this.getCurrentUser()
+            .then(function (user) {
+                var locale = user.locale.toLowerCase();
+                if (locale !== 'en-us') {
+                    var localeUrls = ['lib/moment/' + locale + '.js'];
+                    if (locale.indexOf('-') > -1) {
+                        localeUrls.push('lib/moment/' + locale.split('-')[0] + '.js')
+                    }
+                    assetsService.load(localeUrls).then(function() {
+                        deferred.resolve(localeUrls);
+                    });
+                } else {
+                    deferred.resolve(['']);
+                }
+            });
+        return deferred.promise;
+      },
+
       /** Called whenever a server request is made that contains a x-umb-user-seconds response header for which we can update the user's remaining timeout seconds */
       setUserTimeout: function (newTimeout) {
         setUserTimeoutInternal(newTimeout);
diff --git a/src/Umbraco.Web.UI.Client/src/init.js b/src/Umbraco.Web.UI.Client/src/init.js
index e86fa25c42..32462826fe 100644
--- a/src/Umbraco.Web.UI.Client/src/init.js
+++ b/src/Umbraco.Web.UI.Client/src/init.js
@@ -18,23 +18,26 @@ app.run(['userService', '$log', '$rootScope', '$location', 'queryStrings', 'navi
         eventsService.on("app.authenticated", function(evt, data) {
             
             assetsService._loadInitAssets().then(function() {
-                
-                //Register all of the tours on the server
-                tourService.registerAllTours().then(function () {
-                    appReady(data);
-                    
-                    // Auto start intro tour
-                    tourService.getTourByAlias("umbIntroIntroduction").then(function (introTour) {
-                        // start intro tour if it hasn't been completed or disabled
-                        if (introTour && introTour.disabled !== true && introTour.completed !== true) {
-                            tourService.startTour(introTour);
-                        }
+
+                // Loads the user's locale settings for Moment.
+                userService.loadMomentLocaleForCurrentUser().then(function() {
+
+                    //Register all of the tours on the server
+                    tourService.registerAllTours().then(function () {
+                        appReady(data);
+                        
+                        // Auto start intro tour
+                        tourService.getTourByAlias("umbIntroIntroduction").then(function (introTour) {
+                            // start intro tour if it hasn't been completed or disabled
+                            if (introTour && introTour.disabled !== true && introTour.completed !== true) {
+                                tourService.startTour(introTour);
+                            }
+                        });
+
+                    }, function(){
+                        appReady(data);
                     });
-
-                }, function(){
-                    appReady(data);
                 });
-
             });
 
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 3c8170e54b..10b00fd199 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -154,26 +154,24 @@ angular.module("umbraco")
     .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
     .run(function(mediaHelper, umbRequestHelper, assetsService){
         if (mediaHelper && mediaHelper.registerFileResolver) {
-            assetsService.load(["lib/moment/moment-with-locales.js"]).then(
-                function () {
-                    //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-                    // they contain different data structures so if we need to query against it we need to be aware of this.
-                    mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
-                        if (thumbnail) {
-                            if (mediaHelper.detectIfImageByExtension(property.value)) {
-                                //get default big thumbnail from image processor
-                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first";
-                                return thumbnailUrl;
-                            }
-                            else {
-                                return null;
-                            }
-                        }
-                        else {
-                            return property.value;
-                        }
-                    });
+
+            //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+            // they contain different data structures so if we need to query against it we need to be aware of this.
+            mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
+                if (thumbnail) {
+                    if (mediaHelper.detectIfImageByExtension(property.value)) {
+                        //get default big thumbnail from image processor
+                        var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first";
+                        return thumbnailUrl;
+                    }
+                    else {
+                        return null;
+                    }
                 }
-            );
+                else {
+                    return property.value;
+                }
+            });
+
         }
     });
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index 711430d5ed..1b10ab0ce4 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -99,4 +99,4 @@ module.exports = function (config) {
       'karma-phantomjs-launcher'
     ]
   });
-};
\ No newline at end of file
+};
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index 961fb8e54e..39185cff3f 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -3,7 +3,7 @@
     'lib/angular/1.1.5/angular.min.js',
     'lib/underscore/underscore-min.js',
 
-    'lib/moment/moment-with-locales.js',
+    'lib/moment/moment.min.js',
 
     'lib/jquery-ui/jquery-ui.min.js',
     'lib/jquery-ui-touch-punch/jquery.ui.touch-punch.js',