diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js
index 56e8033dcc..87433865df 100644
--- a/src/sunstone/public/app/tabs/provision-tab.js
+++ b/src/sunstone/public/app/tabs/provision-tab.js
@@ -957,7 +957,7 @@ define(function(require) {
             $("#provision_create_vm .provision_vmgroup").show();
             $("#provision_create_vm .provision_ds").show();
 
-            OpenNebulaTemplate.show({
+            OpenNebula.Template.show({
               data : {
                 id: template_id,
                 extended: false
diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js
index 88c09cd6cd..90bd53c320 100644
--- a/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js
+++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/disk-resize.js
@@ -82,9 +82,10 @@ define(function(require) {
     Tips.setup(context);
     $( ".diskSlider", context).html(RangeSlider.html({
         min: that.diskSize,
-        max: Humanize.sizeToMB("500GB")*1024,
+        max: Humanize.sizeToMB("1024GB")*1024,
         initial: that.diskSize,
-        name: "resize"
+        name: "resize",
+        max_value: ""
     }));
     $( ".uinput-slider-val",context).prop('type', 'text');
     $( ".uinput-slider-val",context).val(Humanize.size($( ".uinput-slider",context).val()));
@@ -115,7 +116,7 @@ define(function(require) {
 
 
     $('#' + DIALOG_ID + 'Form', context).submit(function() {
-      var new_size = $( ".uinput-slider",context).val();
+      var new_size = $( ".uinput-slider-val",context).val();
       new_size = Math.round(parseInt(new_size) / 1024);
       new_size = new_size.toString();
       var obj = {
diff --git a/src/sunstone/public/app/utils/disks-resize.js b/src/sunstone/public/app/utils/disks-resize.js
index e366009a5a..a977f1b4a7 100644
--- a/src/sunstone/public/app/utils/disks-resize.js
+++ b/src/sunstone/public/app/utils/disks-resize.js
@@ -22,6 +22,7 @@ define(function(require){
   var UserInputs = require('utils/user-inputs');
   var WizardFields = require('utils/wizard-fields');
   var DisksResizeTemplate = require('hbs!./disks-resize/html');
+  var Humanize = require('utils/humanize');
 
   return {
     'insert': _insert,
@@ -112,22 +113,20 @@ define(function(require){
       var diskContext;
       $(".disksContainer", disksContext).html("");
 
-      if (disks_base) {
-        $.each(disks_base, function(disk_id, disk) {
-          diskContext = $(
-            '<div class="row diskContainer">'+
-              '<div class="small-12 columns">'+
-                '<label></label>'+
-              '</div>'+
-              '<div class="large-12 columns diskSlider">' +
-              '</div>' +
-            '</div>').appendTo($(".disksContainer", disksContext));
 
-          diskContext.data('template_disk', disk);
-        });
-      }
 
       $.each(disks, function(disk_id, disk) {
+        diskContext = $(
+          '<div class="row diskContainer">'+
+            '<div class="small-12 columns">'+
+              '<label></label>'+
+            '</div>'+
+            '<div class="large-12 columns diskSlider">' +
+            '</div>' +
+          '</div>').appendTo($(".disksContainer", disksContext));
+        if (disks_base) {
+          diskContext.data('template_disk', disks_base[disk_id]);
+        }
 
         var disk_snapshot_total_size = 0;
         if (disk.DISK_SNAPSHOT_TOTAL_SIZE != undefined) {
@@ -191,7 +190,7 @@ define(function(require){
           if (disk.SIZE != undefined){
             // Range from original size to size + 500GB
             var min = parseInt(disk.SIZE);
-            var max = min + 512000;
+            var max = min + Humanize.sizeToMB("1024GB");
 
             attr = UserInputs.parse(
               "SIZE",
@@ -202,6 +201,7 @@ define(function(require){
               "M|number|"+label+"||");
           }
         }
+        attr.max_value = "";
         if(!opts.uinput_mb){
           $(".diskSlider", diskContext).html(UserInputs.attributeInput(attr));
         } else {
diff --git a/src/sunstone/public/app/utils/range-slider.js b/src/sunstone/public/app/utils/range-slider.js
index 3e9fd26804..4f1ae24346 100644
--- a/src/sunstone/public/app/utils/range-slider.js
+++ b/src/sunstone/public/app/utils/range-slider.js
@@ -54,7 +54,6 @@ define(function(require) {
         tick_val += opts.tick_size;
       }
     }
-    
     sliderId += 1;
     return TemplateHTML(opts);
   }
diff --git a/src/sunstone/public/app/utils/range-slider/html.hbs b/src/sunstone/public/app/utils/range-slider/html.hbs
index 1eda58f234..ecaf74da7f 100644
--- a/src/sunstone/public/app/utils/range-slider/html.hbs
+++ b/src/sunstone/public/app/utils/range-slider/html.hbs
@@ -23,8 +23,8 @@
   {{/if}}
   <div class="large-8 small-6 columns">
     <input id="input-{{sliderId}}" type="range" class="uinput-slider"
-      min="{{min}}" max="{{max}}" step="{{step}}" 
-      value="{{initial}}" 
+      min="{{min}}" max="{{max}}" step="{{step}}"
+      value="{{initial}}"
       list="uinput-list-{{sliderId}}"
       {{#if disabled}}disabled="true"{{/if}}/>
     <datalist id="uinput-list-{{sliderId}}">
@@ -34,9 +34,9 @@
     </datalist>
   </div>
   <div class="large-4 small-6 columns">
-    <input type="number" class="uinput-slider-val" 
-      min="{{min}}" max="{{max}}" step="{{step}}" 
-      value="{{initial}}" 
+    <input type="number" class="uinput-slider-val"
+      min="{{min}}" max="{{max_value}}" step="{{step}}"
+      value="{{initial}}"
       {{#unless wizard_field_disabled}}wizard_field="{{name}}"{{/unless}}
       {{#if disabled}}disabled="true"{{/if}} required/>
   </div>
diff --git a/src/sunstone/public/app/utils/user-inputs.js b/src/sunstone/public/app/utils/user-inputs.js
index de0c52a378..aad961d272 100644
--- a/src/sunstone/public/app/utils/user-inputs.js
+++ b/src/sunstone/public/app/utils/user-inputs.js
@@ -719,6 +719,9 @@ define(function(require) {
         break;
       case "range":
       case "range-float":
+        if(attr.max_value != ""){
+          attr.max_value = attr.max;
+        }
         input = RangeSlider.html(attr);
 
         break;