diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php
index 774f6c9..1f01a6f 100644
--- a/lib/TemplateRender.php
+++ b/lib/TemplateRender.php
@@ -2360,13 +2360,13 @@ function deleteAttribute(attrName,friendlyName,i)
 	/** PASSWORD ATTRIBUTES **/
 
 	protected function drawJavascriptPasswordAttribute($attribute) {
-		static $drawn = false;
+		static $drawn = array();
 
 		# This JS may have been rendered by multiple Binary attributes
-		if ($drawn)
+		if (isset($drawn[$attribute->getName()]) && $drawn[$attribute->getName()])
 			return;
 		else
-			$drawn = true;
+			$drawn[$attribute->getName()] = true;
 
 		printf('<!-- START: PASSWORD ATTRIBUTE %s (%s)-->',__METHOD__,$attribute->getName());
 		echo "\n";