Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.36 -r1.36.2.1
--- openacs-4/packages/acs-subsite/lib/login.tcl	26 Jun 2015 20:47:40 -0000	1.36
+++ openacs-4/packages/acs-subsite/lib/login.tcl	8 Sep 2015 08:12:31 -0000	1.36.2.1
@@ -110,7 +110,10 @@
 
 set focus {}
 if { [auth::UseEmailForLoginP] } {
-    ad_form -extend -name login -form [list [list email:text($username_widget),nospell [list label [_ acs-subsite.Email]] [list html [list style "width: 150px"]]]]
+    ad_form -extend -name login \
+	-form [list [list email:text($username_widget),nospell \
+			 [list label [_ acs-subsite.Email]] \
+			 {html {style "width: 150px"}}]]
     set user_id_widget_name email
     if { $email ne "" } {
         set focus "password"
@@ -127,7 +130,10 @@
         }
     }
 
-    ad_form -extend -name login -form [list [list username:text($username_widget),nospell [list label [_ acs-subsite.Username]] [list html [list style "width: 150px"]]]]
+    ad_form -extend -name login \
+	-form [list [list username:text($username_widget),nospell \
+			 [list label [_ acs-subsite.Username]] \
+			 {html {style "width: 150px"}}]]
     set user_id_widget_name username
     if { $username ne "" } {
         set focus "password"
@@ -139,7 +145,7 @@
 
 ad_form -extend -name login -form {
     {password:text(password) 
-        {label "[_ acs-subsite.Password]"}
+        {label [_ acs-subsite.Password]}
 	{html {style "width: 150px"}}
     }
 }