diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp
index 555ee6f5ad4..3934de0aef9 100644
--- a/ui/jsp/template.jsp
+++ b/ui/jsp/template.jsp
@@ -348,10 +348,12 @@
 				</li>					
 				<li>
 					<label for="add_template_hypervisor">Hypervisor:</label>
-					<select class="select" name="add_template_hypervisor" id="add_template_hypervisor">						
+					<select class="select" name="add_template_hypervisor" id="add_template_hypervisor">		
+					    <!--  			
 						<option value='XenServer'>Citrix XenServer</option>
 						<option value='VmWare'>VMware ESX</option>
 						<option value='KVM'>KVM</option>
+						-->	
 					</select>
 				</li>
 				<li>
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index c41c29721fd..e9a5d9eec88 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -54,8 +54,21 @@ function templateGetSearchParams() {
 
 function afterLoadTemplateJSP() {      
     var $detailsTab = $("#right_panel_content #tab_content_details");   
-    
-    //add button ***   
+       
+    $.ajax({
+        data: createURL("command=listHypervisors"),
+        dataType: "json",
+        success: function(json) {            
+            var items = json.listhypervisorsresponse.hypervisor;
+            var $hypervisorDropdown = $("#dialog_add_template").find("#add_template_hypervisor");
+            if(items != null && items.length > 0) {                
+                for(var i=0; i<items.length; i++) {                    
+                    $hypervisorDropdown.append("<option value='"+fromdb(items[i].name)+"'>"+fromdb(items[i].name)+"</option>");
+                }
+            }
+        }    
+    })   
+        
 	$("#dialog_add_template #add_template_hypervisor").bind("change", function(event) {	      
 	    var formatSelect = $("#dialog_add_template #add_template_format").empty();	     
 	    var selectedHypervisorType = $(this).val();