diff --git a/ui/jsp/tab_templates.jsp b/ui/jsp/tab_templates.jsp
index a952484408e..baaabcd4955 100755
--- a/ui/jsp/tab_templates.jsp
+++ b/ui/jsp/tab_templates.jsp
@@ -590,6 +590,14 @@ long milliseconds = new Date().getTime();
 						<option value="false">No</option>
 					</select>
 				</li>
+				<li>
+					<label for="add_iso_hypervisor">Hypervisor:</label>
+					<select class="select" name="add_iso_hypervisor" id="add_iso_hypervisor">
+						<option value='VmWare'>VMware ESX</option>
+						<option value='XenServer'>Citrix XenServer</option>
+						<option value='KVM'>KVM</option>
+					</select>
+				</li>
 				<li>
 					<label for="add_iso_os_type">OS Type:</label>
 					<select class="select" name="add_iso_os_type" id="add_iso_os_type">
diff --git a/ui/scripts/cloud.core.templates.js b/ui/scripts/cloud.core.templates.js
index 40048bd2413..9a7cf4e4685 100644
--- a/ui/scripts/cloud.core.templates.js
+++ b/ui/scripts/cloud.core.templates.js
@@ -753,12 +753,13 @@ function showTemplatesTab() {
 				//var isPublic = thisDialog.find("#add_iso_public").val();
 				var isPublic = "false"; //default to private for now
 				var osType = thisDialog.find("#add_iso_os_type").val();
-				var bootable = thisDialog.find("#add_iso_bootable").val();			
+				var bootable = thisDialog.find("#add_iso_bootable").val();	
+				var hypervisor = thisDialog.find("#add_iso_hypervisor").val();				
 			    				    
 			    thisDialog.dialog("close");									    
 			    				
 				$.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="+encodeURIComponent(name)+"&displayText="+encodeURIComponent(desc)+"&url="+encodeURIComponent(url)+"&zoneId="+zoneId+"&isPublic="+isPublic+"&osTypeId="+osType+"&bootable="+bootable+"&hypervisor="+hypervisor+"&response=json"),
 					dataType: "json",
 					success: function(json) {					
 					    var result = json.registerisoresponse;