diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js
index e0adeec05d7..dcd00503c63 100644
--- a/ui/new/scripts/cloud.core2.iso.js
+++ b/ui/new/scripts/cloud.core2.iso.js
@@ -35,7 +35,7 @@ function afterLoadIsoJSP() {
 		        var $midmenuItem1 = beforeAddingMidMenuItem() ;				    
     		       		    				
 			    $.ajax({
-			        data: createURL("command=registerIso&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&url="+encodeURIComponent(url)+"&zoneId="+zoneId+"&isPublic="+isPublic+"&osTypeId="+osType+"&bootable="+bootable+"&response=json"),
+			        data: createURL("command=registerIso&name="+todb(name)+"&displayText="+todb(desc)+"&url="+encodeURIComponent(url)+"&zoneId="+zoneId+"&isPublic="+isPublic+"&osTypeId="+osType+"&bootable="+bootable+"&response=json"),
 				    dataType: "json",
 				    success: function(json) {					
 				        var items = json.registerisoresponse.iso;				       
@@ -436,7 +436,7 @@ function doCreateVMFromIso($actionLink, listAPIMap, $detailsTab) {
 	        var serviceOfferingId = thisDialog.find("#service_offering").val();				        
 	        var diskOfferingId = thisDialog.find("#disk_offering").val();	        		        
 	                         
-		    var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&serviceOfferingId="+serviceOfferingId+"&diskOfferingId="+diskOfferingId+"&templateId="+id+"&group="+encodeURIComponent(group)+"&displayname="+encodeURIComponent(name);
+		    var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&serviceOfferingId="+serviceOfferingId+"&diskOfferingId="+diskOfferingId+"&templateId="+id+"&group="+todb(group)+"&displayname="+todb(name);
     	    doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap);		
 	    }, 
 	    "Cancel": function() {
diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js
index 4902db124c4..58794e921d2 100644
--- a/ui/new/scripts/cloud.core2.template.js
+++ b/ui/new/scripts/cloud.core2.template.js
@@ -51,7 +51,7 @@ function afterLoadTemplateJSP() {
 				var $midmenuItem1 = beforeAddingMidMenuItem() ;
 												
 				$.ajax({
-				    data: createURL("command=registerTemplate&name="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&url="+encodeURIComponent(url)+"&zoneid="+zoneId+"&ispublic="+isPublic+moreCriteria.join("")+"&format="+format+"&passwordEnabled="+password+"&osTypeId="+osType+"&response=json"),
+				    data: createURL("command=registerTemplate&name="+todb(name)+"&displayText="+todb(desc)+"&url="+encodeURIComponent(url)+"&zoneid="+zoneId+"&ispublic="+isPublic+moreCriteria.join("")+"&format="+format+"&passwordEnabled="+password+"&osTypeId="+osType+"&response=json"),
 					dataType: "json",
 					success: function(json) {	
 						var items = json.registertemplateresponse.template;				       
@@ -526,10 +526,10 @@ function doCreateVMFromTemplate($actionLink, listAPIMap, $detailsTab) {
 	        
 	        var array1 = [];      
 	        var name = trim(thisDialog.find("#name").val());	
-	        array1.push("&displayname="+encodeURIComponent(name));
+	        array1.push("&displayname="+todb(name));
 	        	
 	        var group = trim(thisDialog.find("#group").val());	
-	        array1.push("&group="+encodeURIComponent(group));
+	        array1.push("&group="+todb(group));
 	        	
 	        var serviceOfferingId = thisDialog.find("#service_offering").val();		
 	        array1.push("&serviceOfferingId="+serviceOfferingId);