 		}
 		// END DEPRECATING WRAPLABEL CODE
 
-		arguments = $insertDefaults(name="fileField", reserved="type,name,id", input=arguments);
+		arguments = $insertDefaults(name="fileField", reserved="type,name", input=arguments);
 		loc.before = $formBeforeElement(argumentCollection=arguments);
 		loc.after = $formAfterElement(argumentCollection=arguments);
 		arguments.type = "file";
 		arguments.name = $tagName(arguments.objectName, arguments.property);
-		arguments.id = $tagId(arguments.objectName, arguments.property);
+		if (!StructKeyExists(arguments, "id"))
+			arguments.id = $tagId(arguments.objectName, arguments.property);
 		loc.returnValue = loc.before & $tag(name="input", close=true, skip="objectName,property,label,labelPlacement,prepend,append,prependToLabel,appendToLabel,errorElement", skipStartingWith="label", attributes=arguments) & loc.after;
 	</cfscript>
 	<cfreturn loc.returnValue>

		}
		// END DEPRECATING WRAPLABEL CODE

		arguments = $insertDefaults(name="passwordField", reserved="type,name,id,value", input=arguments);
		loc.before = $formBeforeElement(argumentCollection=arguments);
		loc.after = $formAfterElement(argumentCollection=arguments);
		arguments.type = "password";
		arguments.name = $tagName(arguments.objectName, arguments.property);
		arguments.id = $tagId(arguments.objectName, arguments.property);
		arguments.value = $formValue(argumentCollection=arguments);
		loc.returnValue = loc.before & $tag(name="input", close=true, skip="objectName,property,label,labelPlacement,prepend,append,prependToLabel,appendToLabel,errorElement", skipStartingWith="label", attributes=arguments) & loc.after;
	</cfscript>

		}
		// END DEPRECATING WRAPLABEL CODE

		arguments = $insertDefaults(name="dateSelect", input=arguments);
		arguments.$functionName = "dateSelect";
	</cfscript>
	<cfreturn $dateOrTimeSelect(argumentCollection=arguments)>
