diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
index 4d5b924a85..3e481d2297 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
@@ -263,6 +263,7 @@ define(function(require) {
         target: 'upload_chunk',
         chunkSize: 10 * 1024 * 1024,
         maxFiles: 1,
+        maxFileSize: config['system_config']['max_upload_file_size'],
         testChunks: false,
         query: {
           csrftoken: csrftoken
diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb
index 41f7ad04ee..0f9f55dab4 100644
--- a/src/sunstone/views/index.erb
+++ b/src/sunstone/views/index.erb
@@ -36,7 +36,8 @@
         'system_config' : {
             'marketplace_url' : '<%= $conf[:marketplace_url] %>',
             'vnc_request_password' : <%= $conf[:vnc_request_password] || false %>,
-            'vnc_proxy_port' : '<%= $vnc.proxy_port %>'
+            'vnc_proxy_port' : '<%= $vnc.proxy_port %>',
+            'max_upload_file_size' : <%= $conf[:max_upload_file_size] ? $conf[:max_upload_file_size] : "undefined" %>
         },
         'view' : view,
         'available_views' : available_views,