diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi
index 96a2f67..3b37ac5 100755
--- a/ezmlm-web.cgi
+++ b/ezmlm-web.cgi
@@ -21,8 +21,8 @@ use DB_File;
 use CGI;
 use IO::File;
 use POSIX qw(tmpnam);
-use Encode qw/ from_to /;	# add by ooyama for char convert
-use English;			# for dropping privileges
+use Encode qw/ from_to /;	# added by ooyama for char convert
+use English;
 
 # do not forget: we depend on Mail::Ezmlm::Gpg if the corresponding configuration
 # setting is turned on
@@ -1640,7 +1640,7 @@ sub update_webusers {
 	close $fh; 
 	unless (open(TMP, ">$temp_file")) {
 		warn "could not open a temporary file";
-		return (1==0);;
+		return (1==0);
 	}
 	open(WU, "<$WEBUSERS_FILE");
 	while(<WU>) { print TMP; }
diff --git a/share/template/macros.cs b/share/template/macros.cs
index dc1a345..0dbe881 100644
--- a/share/template/macros.cs
+++ b/share/template/macros.cs
@@ -78,7 +78,7 @@ def:link(attr1, value1, attr2, value2, attr3, value3)
 		?><?cs set:attrs = ""
 	?><?cs /each
 	?><?cs each:attrs = Config.UI.LinkAttrs
-		?><?cs set:Temp[name(attrs)] = attrs
+		?><?cs set:Temp[url_escape(name(attrs))] = url_escape(attrs)
 		?><?cs /each
 	?><?cs if:attr1 != "" ?><?cs set:Temp[attr1] = value1 ?><?cs /if
 	?><?cs if:attr2 != "" ?><?cs set:Temp[attr2] = value2 ?><?cs /if
@@ -97,3 +97,4 @@ def:link(attr1, value1, attr2, value2, attr3, value3)
 		?><?cs /each
 	?><?cs /if ?><?cs
  /def ?>
+