diff --git a/ui/content/tab_storage.html b/ui/content/tab_storage.html
index 9c3ae3b51fa..3532f846f29 100644
--- a/ui/content/tab_storage.html
+++ b/ui/content/tab_storage.html
@@ -1493,7 +1493,14 @@
 					<label>OS Type:</label>
 					<select class="select" id="os_type">
 					</select>
-				</li>				
+				</li>		
+				<li>
+					<label>Password Enabled?:</label>
+					<select class="select" id="password">						
+						<option value="false">No</option>
+						<option value="true">Yes</option>
+					</select>
+				</li>		
 			</ol>
 		</form>
 	</div>
diff --git a/ui/scripts/cloud.core.storage.js b/ui/scripts/cloud.core.storage.js
index 3142ab48787..f4c55f8cf01 100644
--- a/ui/scripts/cloud.core.storage.js
+++ b/ui/scripts/cloud.core.storage.js
@@ -542,7 +542,8 @@ function showStorageTab(domainId, targetTab) {
 	                         
 	                         var name = thisDialog.find("#name").val();	 
 	                         var displayText = thisDialog.find("#display_text").val();	 
-	                         var osTypeId = thisDialog.find("#os_type").val(); 	                                           
+	                         var osTypeId = thisDialog.find("#os_type").val(); 	 
+	                         var password = thisDialog.find("#password").val();		                                          
 	                         thisDialog.dialog("close");	
 	                         		     	                                                         	                                                  						
 							 var loadingImg = template.find(".adding_loading");							
@@ -552,7 +553,7 @@ function showStorageTab(domainId, targetTab) {
 				             rowContainer.hide(); 	                                  
 	                                                    
 	                         $.ajax({
-						         data: "command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&response=json",
+						         data: "command=createTemplate&snapshotid="+snapshotId+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password+"&response=json",
 						         dataType: "json",
 						         success: function(json) {							            					           								 
 							        var jobId = json.createtemplateresponse.jobid;