diff --git a/src/sunstone/public/js/locale.js b/src/sunstone/public/js/locale.js
index b3a43d4c0e..a029ff8d34 100644
--- a/src/sunstone/public/js/locale.js
+++ b/src/sunstone/public/js/locale.js
@@ -58,10 +58,14 @@ function setLang(lang_str){
                 id: uid,
                 extra_param: template_str
             },
-            error: onError
+            error: onError,
+            success: function() {
+                $.post('config',JSON.stringify({lang:lang_tmp}),function(){
+                    window.location.href = ".";
+                });
+            },
         };
         OpenNebula.User.update(obj);
-        $.post('config',JSON.stringify({lang:lang_tmp}),function(){window.location.href = "."});
 
     };
 
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index 7877635b51..39fae61534 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -747,6 +747,9 @@ function setupTemplateUpdateDialog(){
             return false;
         };
 
+        //Workaround so deletion of templates is allowed.
+        if (!new_template) new_template=" ";
+
         var resource = $(this).val();
         Sunstone.runAction(resource+".update",id,new_template);
         dialog.dialog('close');