diff --git a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
index d507a30e4e..3f2838e011 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl
@@ -1,6 +1,6 @@
-<!-- TMPL_INCLUDE name="members-top.inc" -->
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 <div id="mainbloc">
-<!-- TMPL_IF name="surname" -->
+<!-- TMPL_IF NAME="surname" -->
 	<h1>Edit Institution</h1>
 <!-- TMPL_ELSE -->
 	<h1>Add new Institution</h1>
@@ -22,26 +22,26 @@
       <td colspan="2" align="right">
         <strong>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</strong>
       </td>
-      <td align="right"><input type="text" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME=cardnumber_institution -->"></td>
+      <td align="right"><input type="text" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->"></td>
     </tr>
 
     <tr valign="top" bgcolor="#99cc33">
-      <td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-        <B>INSTITUTION DETAILS</b>
+      <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+        <b>INSTITUTION DETAILS</b>
       </td>
-      <td colspan="2" align="right" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">&nbsp;</td>
+      <td colspan="2" align="right" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
     </tr>
 
     <tr>
       <td colspan="3">Institution Name</td>
     </tr>
     <tr>
-      <td colspan="3"><input type="text" name="institution_name" size="50" value="<!-- TMPL_VAR name="surname" -->"></td>
+      <td colspan="3"><input type="text" name="institution_name" size="50" value="<!-- TMPL_VAR NAME="surname" -->"></td>
     </tr>
 
-    <tr valign="top" bgcolor="99cc33" >
-      <td  colspan="3" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	  <B>INSTITUTION ADDRESS</b>
+    <tr valign="top" bgcolor="#99cc33" >
+      <td  colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>INSTITUTION ADDRESS</b>
       </td>
     </tr>
 
@@ -51,16 +51,16 @@
 	<td>Area</td>
     </tr>
     <tr>
-	<td><input type="text" name="address" size="40" value="<!-- TMPL_VAR name="streetaddress" -->"></td>
-	<td><input type="text" name="zipcode" size="20" value="<!-- TMPL_VAR name="zipcode" -->"> <br> <input type="text" name="city" size="20" value="<!-- TMPL_VAR name="city" -->"></td>
+	<td><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="streetaddress" -->"></td>
+	<td><input type="text" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->"> <br> <input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"></td>
 	<td>
-      	<!-- TMPL_VAR name="CGIbranch" -->
+      	<!-- TMPL_VAR NAME="CGIbranch" -->
 	 </td>
     </tr>
 
     <tr valign="top" bgcolor="#99cc33">
-      <td colspan="3" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	  <B>CONTACT DETAILS</b>
+      <td colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>CONTACT DETAILS</b>
       </td>
     </tr>
 
@@ -68,7 +68,7 @@
 	<td colspan="3">Contact Name*</td>
     </tr>
     <tr>
-	<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR name="contactname" -->"></td>
+	<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
     </tr>
 
 
@@ -78,38 +78,38 @@
 	<td>Email</td>
     </tr>
     <tr>
-	<td ><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR name="phoneday" -->"></td>
-	<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR name="faxnumber" -->"></td>
-	<td ><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR name="emailaddress" -->"></td>
+	<td ><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+	<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+	<td ><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
     </tr>
 
     <tr>
 	<td>Notes</td>
     </tr>
     <tr>
-	<td colspan="3"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR name="altnotes" --></textarea></td>
+	<td colspan="3"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
     </tr>
 
     <tr valign="top" bgcolor="#99cc33"  >
-	<td  colspan="3"  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>LIBRARY USE</B></td>
+	<td  colspan="3"  background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>LIBRARY USE</b></td>
     </tr>
 
     <tr>
 	<td colspan="3">Notes</td>
     </tr>
     <tr valign="top" >
-	<td colspan="3"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR name="borrowernotes" --></textarea></td>
+	<td colspan="3"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
     </tr>
 
     <tr>
-	<td  colspan="3" align=right >
+	<td  colspan="3" align="right" >
 	  <input type="submit" class="button" value="Save Changes">
       </td>
     </tr>
   </table>
 </form>
 </div>
-<!-- TMPL_VAR NAME=endmenumember -->
+<!-- TMPL_VAR NAME="endmenumember" -->
 
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
index 62790d00f8..9e7bdecf05 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl
@@ -1,81 +1,81 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 <div id="mainbloc">
 	<h1>Add New Junior Member </h1><br>
-	<form action=/cgi-bin/koha/members/newjmember.pl method=post>
-		<!--<input type=hidden name=joining value="">
-		<input type=hidden name=expiry value="">
-		<input type=hidden name=type value="borrowers">-->
-		<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-		<input type=hidden name=updtype value=I>
-		<input type=hidden name=area value="<!-- TMPL_VAR NAME=area -->">
-		<input type=hidden name=city value="<!-- TMPL_VAR NAME=city -->">
-		<input type=hidden name=physstreet value="<!-- TMPL_VAR NAME=physstreet -->">
-		<input type=hidden name=streetaddress value="<!-- TMPL_VAR NAME=streetaddress -->">
-		<input type=hidden name=streetcity value="<!-- TMPL_VAR NAME=streetcity -->">
-		<input type=hidden name=phone value="<!-- TMPL_VAR NAME=phone -->">
-		<input type=hidden name=phoneday value="<!-- TMPL_VAR NAME=phoneday -->">
-		<input type=hidden name=faxnumber value="<!-- TMPL_VAR NAME=faxnumber -->">
-		<input type=hidden name=emailaddress value="<!-- TMPL_VAR NAME=emailaddress -->">
-		<input type=hidden name=contactname value="<!-- TMPL_VAR NAME=contactname -->">
-		<input type=hidden name=altphone value"<!-- TMPL_VAR NAME=altphone -->">
+	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
+		<!--<input type="hidden" name="joining" value="">
+		<input type="hidden" name="expiry" value="">
+		<input type="hidden" name="type" value="borrowers">-->
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+		<input type="hidden" name="updtype" value="I">
+		<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
+		<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->">
+		<input type="hidden" name="physstreet" value="<!-- TMPL_VAR NAME="physstreet" -->">
+		<input type="hidden" name="streetaddress" value="<!-- TMPL_VAR NAME="streetaddress" -->">
+		<input type="hidden" name="streetcity" value="<!-- TMPL_VAR NAME="streetcity" -->">
+		<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->">
+		<input type="hidden" name="phoneday" value="<!-- TMPL_VAR NAME="phoneday" -->">
+		<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->">
+		<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->">
+		<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->">
+		<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->">
 	
-		<table border=0 cellspacing=0 cellpadding=5 >
+		<table border="0" cellspacing="0" cellpadding="5" >
 		<tr>
-			<th  colspan=5>
+			<th  colspan="5">
 				PARENT OR GUARDIAN 
 			</th>
 		</tr>
-		<tr valign=top bgcolor=white>
+		<tr valign="top" bgcolor="white">
 			<td>Salutation</td>
 			<td>Given Names*</td>
-			<td colspan=2>Surname*</td>
+			<td colspan="2">Surname*</td>
 			<td>Membership No.</td>
 		</tr>
 		<tr>
 			<td>
-				<select NAME="title" SIZE="1">
+				<select name="title" size="1">
 					<option value=" ">No Title
-					<!-- TMPL_LOOP NAME=titleloop -->
-					<option value="<!-- TMPL_VAR NAME=title -->" <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=title -->
+					<!-- TMPL_LOOP NAME="titleloop" -->
+					<option value="<!-- TMPL_VAR NAME="title" -->" <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="title" -->
 					<!-- /TMPL_LOOP -->
 				</select>
 			</td>
-			<td><input type=text name=firstname_guardian size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
-			<td colspan=2><input type=text name=surname_guardian size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
-			<td><input type=text name=guardian_number size=20 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
+			<td><input type="text" name="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"></td>
+			<td colspan="2"><input type="text" name="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
+			<td><input type="text" name="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
 		</tr>
-		<!-- TMPL_LOOP NAME=cmemloop -->
+		<!-- TMPL_LOOP NAME="cmemloop" -->
 		<tr>
-			<tH colspan=5>
-				CHILD <!-- TMPL_VAR NAME=count -->
+			<tH colspan="5">
+				CHILD <!-- TMPL_VAR NAME="count" -->
 			</tH>
-		</TR>
-		<TR>
-			<td colspan=5>
-				Member# <!-- TMPL_VAR NAME=cmember -->, Card number*
-				<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
-				<input type=hidden name=bornumber_child_<!-- TMPL_VAR NAME=i --> value="<!-- TMPL_VAR NAME=cmember -->">
+		</tr>
+		<tr>
+			<td colspan="5">
+				Member# <!-- TMPL_VAR NAME="cmember" -->, Card number*
+				<input type="text" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->"><br>
+				<input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->">
 			</td>
-		</TR>
+		</tr>
 		<tr>
 			<td>Given Name*</td>
 			<td>Surname*</td>
-			<td>Date of Birth (<!-- TMPL_VAR NAME=dateformat -->)*</td>
+			<td>Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)*</td>
 			<td>&nbsp;</td>
 			<td>School</td>
 		</tr>
 		<tr>
-			<td><input type=text name=firstname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-			<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-			<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></td>
+			<td><input type="text" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10" value=""></td>
 			<td>
-				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>F</b>
-				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>M*</b>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F"><b>F</b>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M"><b>M*</b>
 			</td>
-			<td><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
+			<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
 		</tr>
 		<tr>
-			<td colspan=5>The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
 		<tr>
 			<td>Sorting field 1</td>
 			<td colspan="4">
@@ -92,17 +92,17 @@
 			<td>Notes</td>
 		</tr>
 		<tr>
-			<td colspan=5><textarea name=altnotes_child_<!-- TMPL_VAR NAME=i --> wrap=physical cols=70 rows=3></textarea></td>
+			<td colspan="5"><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" wrap="physical" cols="70" rows="3"></textarea></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 		<tr>
 			<td>
-				<input type=submit class="button members" value="OK">
+				<input type="submit" class="button members" value="OK">
 			</td>
-			<td><input type=reset class="button members" value="Clear all Fields"></td>
+			<td><input type="reset" class="button members" value="Clear all Fields"></td>
 		</tr>
 	
-		</TABLE>
+		</table>
 	</form>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl
index fcf2a6da0e..1106d7ff1b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl
@@ -1,18 +1,18 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 <div id="mainbloc">
 	<div id="bloc25">
-		<div id="bloctitle">FLAGS for <!-- TMPL_VAR NAME=surname -->, <!-- TMPL_VAR NAME=firstname --></div>
-		<form method=post action="/cgi-bin/koha/members/member-flags.pl">
-			<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
-			<input type=hidden name=newflags value=1>
-			<!-- TMPL_LOOP NAME=loop -->
+		<div id="bloctitle">FLAGS for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
+		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
+			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>
+			<input type="hidden" name="newflags" value="1">
+			<!-- TMPL_LOOP NAME="loop" -->
 				<p>
-					<input type=checkbox name="flag-<!-- TMPL_VAR NAME=bit -->" <!-- TMPL_VAR NAME=checked -->>
-					<!-- TMPL_VAR NAME=flag -->
-					<!-- TMPL_VAR NAME=flagdesc -->
+					<input type="checkbox" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" -->>
+					<!-- TMPL_VAR NAME="flag" -->
+					<!-- TMPL_VAR NAME="flagdesc" -->
 				</p>
 			<!-- /TMPL_LOOP -->
-			<input type=submit value="Set Flags" class="button">
+			<input type="submit" value="Set Flags" class="button">
 		</form>
 	</div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
index 308ba00ef4..e119ee7984 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
@@ -4,12 +4,12 @@
 		<div id="bloc25">
 		<div id="bloctitle"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
 		<form method="post" action="/cgi-bin/koha/members/member-password.pl">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME=member -->">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
 			<!-- TMPL_IF NAME="warn" -->
 				You have entered a UserID that already exists.  Please choose another one.<br>
 			<!-- /TMPL_IF -->
-			New UserID: <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->"> <br>
-			New Password: <input name="newpassword" size="20" value="<!-- TMPL_VAR NAME=defaultnewpassword -->"><br>
+			New UserID: <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
+			New Password: <input name="newpassword" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->"><br>
 			<input type="submit" value="Confirm Password" class="button">
 		</form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index fce35b8cc1..ef6b13fcbc 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -4,8 +4,8 @@
 
 <div class="bloc100">
 	<div class="bloctitle">Search on</div>
-	<form action="/cgi-bin/koha/members/member.pl" method=post>
-		<input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
 		<input type="submit" class="button" value="OK">
 	</form>
 </div>
@@ -41,7 +41,7 @@
 		<!-- /TMPL_LOOP -->
 	</table>
 	<form action="/cgi-bin/koha/members/simpleredirect.pl" method="post">
-	<input type=submit class="button" value="Add member" title="Add member" alt="Add member">
+	<input type="submit" class="button" value="Add member" title="Add member" alt="Add member">
 	<input type="radio" name="chooseform" value="adult" checked>Adult
 	<input type="radio" name="chooseform" value="organisation" >Organisation
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 7f7979c9b0..c74c375c98 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <div id="mainbloc">
-	<!-- TMPL_IF NAME=addAction -->
+	<!-- TMPL_IF NAME="addAction" -->
 	<h1>
 		Add member
 	</h1>
@@ -15,25 +15,25 @@
 		<h1>ERROR</h1>
 		<div id="problem">
 			<p>The following fields have a forbidden value. Correct them and press OK again :</p>
-			<!-- TMPL_IF name="ERROR_cardnumber" -->
+			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
 				Card number<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_invalid_cardnumber" -->
+			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
 				Invalid cardnumber<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_gender" -->
+			<!-- TMPL_IF NAME="ERROR_gender" -->
 				Gender<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_firstname" -->
+			<!-- TMPL_IF NAME="ERROR_firstname" -->
 				Given Names<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_surname" -->
+			<!-- TMPL_IF NAME="ERROR_surname" -->
 				Surname<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="aERROR_ddress" -->
+			<!-- TMPL_IF NAME="aERROR_ddress" -->
 				Postal Street Address<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_city" -->
+			<!-- TMPL_IF NAME="ERROR_city" -->
 				Postal city<br>
 			<!-- /TMPL_IF -->
 		</div>
@@ -51,7 +51,7 @@
 		<!-- /TMPL_IF -->
 		<table>
 			<tr>
-				<td colspan="5">Member# <!-- TMPL_VAR NAME="member" -->, Card number* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
+				<td colspan="5">Member# <!-- TMPL_VAR NAME="member" -->, Card number* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
 			</tr>
 			<tr>
 				<th colspan="5">MEMBER PERSONAL DETAILS</th>
@@ -60,22 +60,22 @@
 				<td><!-- TMPL_UNLESS name="institution" -->Salutation<!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_UNLESS name="institution" -->Initials<!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_UNLESS name="institution" --><b> Given Names*</b><!-- /TMPL_UNLESS --></td>
-				<td><!-- TMPL_IF name="institution" --><b>Institution name*</b><!-- TMPL_ELSE --><b> Surname*</b><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF NAME="institution" --><b>Institution name*</b><!-- TMPL_ELSE --><b> Surname*</b><!-- /TMPL_IF --></td>
 				<td><!-- TMPL_UNLESS name="institution" -->Prefered Name<!-- /TMPL_UNLESS --></td>
 			</tr>
 			<tr>
 				<td>
 				<!-- TMPL_UNLESS name="institution" -->
-				<!-- TMPL_VAR name="Mr" -->
-				<SELECT NAME="title">
-					<option <!-- TMPL_VAR name="title_selected_ " --> value=" ">No Title</option>
-					<option value="Miss" <!-- TMPL_VAR name="title_Miss" -->>Miss</option>
-					<option value="Mrs" <!-- TMPL_VAR name="title_Mrs" -->>Mrs</option>
-					<option value="Ms" <!-- TMPL_VAR name="title_Ms" -->>Ms</option>
-					<option <!-- TMPL_VAR name="title_Mr" --> value="Mr" >Mr</option>
-					<option value="Dr" <!-- TMPL_VAR name="title_Dr" -->>Dr</option>
-					<option value="Sir" <!-- TMPL_VAR name="title_Sir" -->>Sir</option>
-				</SELECT>
+				<!-- TMPL_VAR NAME="Mr" -->
+				<select name="title">
+					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">No Title</option>
+					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
+					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
+					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Ms</option>
+					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
+					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
+					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
+				</select>
 				<!-- /TMPL_UNLESS -->
 				</td>
 				<td>
@@ -100,31 +100,31 @@
 				<td colspan="2">
 				<!-- TMPL_UNLESS name="institution" -->
 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F
-					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME="female" --> checked<!-- /TMPL_UNLESS -->> M
+					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
 				<!-- /TMPL_UNLESS -->
 
 				</td>
 				<td colspan="2">
 					<!-- TMPL_UNLESS name="institution" -->
-					Date of Birth (<!-- TMPL_VAR NAME=dateformat -->)
-					<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME=dateofbirth -->">
+					Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)
+					<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
 					<!-- /TMPL_UNLESS -->
 				</td>
 				<td>
-					Category <!-- TMPL_VAR NAME=catcodepopup -->
+					Category <!-- TMPL_VAR NAME="catcodepopup" -->
 				</td>
 			</tr>
-			<!-- TMPL_IF NAME=ethcatpopup -->
+			<!-- TMPL_IF NAME="ethcatpopup" -->
 				<tr valign="top" bgcolor="white">
-					<!-- TMPL_VAR NAME=ethcatpopup -->
+					<!-- TMPL_VAR NAME="ethcatpopup" -->
 					<td colspan="2">Ethnicity</td>
 					<td colspan="2">Ethnicity Notes</td>
 				</tr>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ethcatpopup" -->
+			<!-- TMPL_IF NAME="ethcatpopup" -->
 				<tr valign="top" bgcolor="white">
 					<td colspan="2">
-						<!-- TMPL_IF name="ethcatpopup" -->
+						<!-- TMPL_IF NAME="ethcatpopup" -->
 							<select name="ethnicity" size="1">
 								<!-- TMPL_LOOP NAME="ethnicityloop" -->
 								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
@@ -153,13 +153,13 @@
 			<tr>
 				<td colspan="2"><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
 				<td>
-					<input type="text" name="zipcode" size="10" maxlength=20 value="<!-- TMPL_VAR NAME="zipcode" -->">
+					<input type="text" name="zipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
 				</td>
 				<td>
 					<input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
 				</td>
 				<td>
-					<!-- TMPL_VAR name="CGIbranch" -->
+					<!-- TMPL_VAR NAME="CGIbranch" -->
 				</td>
 			</tr>
 
@@ -243,7 +243,7 @@
 				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
 			</tr>
 			<!-- TMPL_IF NAME="modify" -->
-				<tr><td colspan=5>FLAGS</td></tr>
+				<tr><td colspan="5">FLAGS</td></tr>
 				<!-- TMPL_LOOP NAME="flagloop" -->
 				<tr>
 					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
@@ -255,7 +255,7 @@
 			<!-- /TMPL_IF -->
 
 			<tr>
-				<td colspan=5>The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+				<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
 			<tr>
 				<td>Sorting field 1</td>
 				<td colspan="4">
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
index d1e18debba..81c067a3ff 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
@@ -4,8 +4,8 @@
 
 <div id="bloc25">
 	<div class="bloctitle">Member Search</div>
-	<FORM ACTION="/cgi-bin/koha/members/member.pl" method=post>
-		<input type="text" size=50 name=member >
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<input type="text" size="50" name="member" >
 		<input type="submit" class="button" value="OK">
 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
@@ -13,32 +13,32 @@
 </div>
 <div id="bloc25">
 			<div class="bloctitle">Browse Members</div>
-			<A HREF="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=c">C</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=d">D</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=e">E</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=f">F</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=g">G</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=h">H</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=i">I</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=j">J</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=k">K</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=l">L</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=m">M</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=n">N</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=o">O</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=p">P</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=q">Q</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=r">R</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=s">S</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=t">T</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=u">U</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=v">V</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=w">W</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=x">X</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=y">Y</a> ||
-			<A HREF="/cgi-bin/koha/members/member.pl?member=z">Z</a>
+			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=c">C</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=d">D</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=e">E</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=f">F</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=g">G</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=h">H</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=i">I</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=j">J</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=k">K</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=l">L</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=m">M</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=n">N</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=o">O</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=p">P</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=q">Q</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=r">R</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=s">S</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=t">T</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=u">U</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=v">V</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=w">W</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=x">X</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=y">Y</a> ||
+			<a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index ac41b2c64d..20d11cbd9c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -4,10 +4,10 @@
 	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 	<div id="bloc25">
 		<h2 class="members">Membership record</h2>
-		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
+		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
 		<p>Card number: <!-- TMPL_VAR NAME="cardnumber" --><br>
-		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
-		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
+		Postal Address: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
+		<!-- TMPL_UNLESS name="I" -->Home Address: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
 		Phone home: <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
 		Phone daytime: <!-- TMPL_VAR NAME="phoneday" --><br>
 		Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
@@ -34,17 +34,17 @@
 			Relationship: <!-- TMPL_VAR NAME="altrelationship" --><br>
 		<!-- /TMPL_UNLESS -->
 		Notes: <!-- TMPL_VAR NAME="altnotes" -->
-		<!-- TMPL_IF name="sort1" -->
-			<p>Sort field 1 : <!-- TMPL_VAR name="sort1" --></p>
+		<!-- TMPL_IF NAME="sort1" -->
+			<p>Sort field 1 : <!-- TMPL_VAR NAME="sort1" --></p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="sort2" -->
-			<p>Sort field 2 : <!-- TMPL_VAR name="sort2" --></p>
+		<!-- TMPL_IF NAME="sort2" -->
+			<p>Sort field 2 : <!-- TMPL_VAR NAME="sort2" --></p>
 		<!-- /TMPL_IF -->
 		</p>
 		<p>
 		<!-- TMPL_UNLESS name="I" -->
 			<!-- TMPL_IF NAME="isguarantee" -->
-				Guarantees:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
+				Guarantees:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
 			<!-- TMPL_ELSE -->
 				Guarantor:
 				<!-- TMPL_IF NAME="guarantorborrowernumber" -->
@@ -56,48 +56,48 @@
 		<!-- /TMPL_UNLESS -->
 		</p>
 		<p>
-			General Notes: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
+			General Notes: <!--<a href="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
 			<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
 		</p>
 
-		<!-- TMPL_IF name="IS_ADULT" -->
+		<!-- TMPL_IF NAME="IS_ADULT" -->
 			
 			<form action="/cgi-bin/koha/members/jmemberentry.pl" method="post">
 				<input type="submit" name="submit" VALUE="Add Child" class="button" alt="Add Child">
 				<input type="hidden" name="type" value="Add">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME=borrowernumber -->">
+				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 			</form>
 			
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="I" -->
+		<!-- TMPL_IF NAME="I" -->
 			<form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
-				<INPUT TYPE=submit class="button" value="Modify">
+				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<input type="submit" class="button" value="Modify">
 			</form>
 		<!-- TMPL_ELSE -->
 			<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
 				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-				<INPUT TYPE="submit" class="button" name="modify" value="Modify">
+				<input type="submit" class="button" name="modify" value="Modify">
 			</form>
 		<!-- /TMPL_IF -->
 		<form action="javascript:confirm_deletion()">
 			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<INPUT TYPE="submit" class="button" value="Delete">
+			<input type="submit" class="button" value="Delete">
 		</form>
 		<form action="/cgi-bin/koha/members/member-password.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
 			<input type="submit" class="button" value="Change Password">
 		</form>
 		<form action="/cgi-bin/koha/members/member-flags.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
 			<input type="submit" class="button" value="Modify User Flags">
 		</form>
 	</div>
 
 	<div id="bloc25">
 		<h2 class="members">Fines &amp; charges</h2>
-		<!-- TMPL_IF name="totaldue" -->
-			Total due <!-- TMPL_VAR name="totaldue"-->
+		<!-- TMPL_IF NAME="totaldue" -->
+			Total due <!-- TMPL_VAR NAME="totaldue"-->
 		<TMPL_ELSE>
 			No debts
 		</TMPL_IF>
@@ -112,7 +112,7 @@
 	</div>
 	<div id="bloc25">
 		<h2 class="members">Items requested</h2>
-			<!-- TMPL_IF NAME=reserveloop -->
+			<!-- TMPL_IF NAME="reserveloop" -->
 			<form action="/cgi-bin/koha/modrequest.pl" method="post">
 			<table>
 				<tr>
@@ -120,11 +120,11 @@
 					<th>Requested</th>
 					<th>Remove</th>
 				</tr>
-					<!-- TMPL_LOOP NAME=reserveloop -->
+					<!-- TMPL_LOOP NAME="reserveloop" -->
 					<tr>
 						<td><input type="hidden" name="from" value="borrower">
 							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-							<!-- TMPL_IF NAME=volumeddesc -->
+							<!-- TMPL_IF NAME="volumeddesc" -->
 								<!-- TMPL_VAR NAME="volumeddesc" -->
 								<!-- TMPL_VAR NAME="itemtype" -->
 							<!-- /TMPL_IF -->
@@ -142,7 +142,7 @@
 					<!-- /TMPL_LOOP -->
 					<tr>
 						<td colspan="5" align="right">
-						<!-- TMPL_IF name="reserveloop" -->
+						<!-- TMPL_IF NAME="reserveloop" -->
 							<input type="submit" name="submit" value="Update" class="button">
 						<!-- /TMPL_IF -->
 						</td>
@@ -160,9 +160,9 @@
 
 	<div id="bloc25">
 		<h2 class="members">Items currently on issue</h2>
-		<!-- TMPL_IF name="issueloop" -->
+		<!-- TMPL_IF NAME="issueloop" -->
 			<form action="renewscript.pl" method="post">
-			<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
 
 			<table>
 			<tr>
@@ -173,10 +173,10 @@
 				<th>Renew</th>
 			</tr>
 
-			<!-- TMPL_LOOP NAME=issueloop -->
+			<!-- TMPL_LOOP NAME="issueloop" -->
 			<tr>
-				<td><!-- TMPL_IF NAME=red --><font color="red"><!-- /TMPL_IF -->
-				<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
+				<td><!-- TMPL_IF NAME="red" --><font color="red"><!-- /TMPL_IF -->
+				<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="red" --></font><!-- /TMPL_IF -->
 				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 					<!-- TMPL_VAR NAME="barcode" -->
 				</a>
@@ -185,7 +185,7 @@
 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
 				<td><!-- TMPL_VAR NAME="charge" --></td>
 				<td>
-				<!-- TMPL_IF NAME=norenew -->
+				<!-- TMPL_IF NAME="norenew" -->
 					<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
 				<!-- TMPL_ELSE -->
 					<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl
index eb72fc603e..a66379653b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl
@@ -1,178 +1,178 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <!-- TMPL_IF NAME="missingloop" -->
-	<!-- TMPL_VAR Name="string" -->
+	<!-- TMPL_VAR NAME="string" -->
 <!-- TMPL_ELSE -->
-	<!-- TMPL_IF NAME=invalid -->
+	<!-- TMPL_IF NAME="invalid" -->
 		Invalid cardnumber.<p>
 	<!-- TMPL_ELSE -->
-	<H1> Confirm Record </H1>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> NEW MEMBER </B>
+	<h1> Confirm Record </h1>
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> NEW MEMBER </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Name</B>
+				<b>Name</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="institution_name" -->
+				<!-- TMPL_VAR NAME="institution_name" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> MEMBERSHIP DETAILS </B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> MEMBERSHIP DETAILS </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Membership Number</B>
+				<b>Membership Number</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornum" -->
+				<!-- TMPL_VAR NAME="bornum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Card number</B>
+				<b>Card number</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="cardnumber_institution" -->
+				<!-- TMPL_VAR NAME="cardnumber_institution" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Joining Branch</B>
+				<b>Joining Branch</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="branchcode" -->
+				<!-- TMPL_VAR NAME="branchcode" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>MEMBER ADDRESS</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>MEMBER ADDRESS</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Postal Address</B>
+				<b>Postal Address</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="postal" -->
+				<!-- TMPL_VAR NAME="postal" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Home Address</B>
+				<b>Home Address</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="home" -->
+				<!-- TMPL_VAR NAME="home" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>MEMBER CONTACT DETAIL</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>MEMBER CONTACT DETAIL</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone (Home)</B>
+				<b>Phone (Home)</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phone" -->
+				<!-- TMPL_VAR NAME="phone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone (Daytime)</B>
+				<b>Phone (Daytime)</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phoneday" -->
+				<!-- TMPL_VAR NAME="phoneday" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Fax</B>
+				<b>Fax</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="faxnumber" -->
+				<!-- TMPL_VAR NAME="faxnumber" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>E-mail</B>
+				<b>E-mail</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="emailaddress" -->
+				<!-- TMPL_VAR NAME="emailaddress" -->
 			</td>
 		</tr>
-                <tr valign=top bgcolor="white" >
+                <tr valign="top" bgcolor="white" >
                         <td>
-                                <B>Text messaging</B>
+                                <b>Text messaging</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME=textmessaging -->
+				<!-- TMPL_VAR NAME="textmessaging" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>ALTERNATIVE CONTACT DETAIL</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>ALTERNATIVE CONTACT DETAIL</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Name</B>
+				<b>Name</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="contactname" -->
+				<!-- TMPL_VAR NAME="contactname" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone</B>
+				<b>Phone</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altphone" -->
+				<!-- TMPL_VAR NAME="altphone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Relationship</B>
+				<b>Relationship</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altrelationship" -->
+				<!-- TMPL_VAR NAME="altrelationship" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Notes</B>
+				<b>Notes</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altnotes" -->
+				<!-- TMPL_VAR NAME="altnotes" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>NOTES</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>NOTES</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>General Notes</B>
+				<b>General Notes</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornotes" -->
+				<!-- TMPL_VAR NAME="bornotes" -->
 			</td>
 		</tr>
-		</TABLE><p>
+		</table><p>
 		Valid values. click OK to confirm this new borrower
-		<form action="/cgi-bin/koha/members/insertidata.pl" method=post>
-			<!-- TMPL_LOOP NAME=inputsloop -->
-				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		<form action="/cgi-bin/koha/members/insertidata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value=OK>
+			<input type="submit" name="submit" value="OK">
 		</form>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
index 8d314769e1..44f5c61112 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl
@@ -1,84 +1,84 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 <div id="mainbloc">
 	<!-- TMPL_IF Name="NOK" -->
-		<!-- TMPL_VAR Name="string" -->
+		<!-- TMPL_VAR NAME="string" -->
 	<!-- TMPL_ELSE -->
-		<H1> Confirm Record </H1>
+		<h1> Confirm Record </h1>
 		<!-- TMPL_LOOP Name="identsloop" -->
 			<!-- TMPL_IF Name="cardchild" -->
-				<table border=0 cellspacing=0 cellpadding=5>
-					<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-						<td background="<!-- TMPL_VAR Name="image" -->">
-						<B> NEW MEMBER </B>
+				<table border="0" cellspacing="0" cellpadding="5">
+					<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+						<td background="<!-- TMPL_VAR NAME="image" -->">
+						<b> NEW MEMBER </b>
 						</td>
 						<td>
 						&nbsp;
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>Name</B>
+						<b>Name</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="name" -->
+						<!-- TMPL_VAR NAME="name" -->
 						</td>
 					</tr>
-					<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-						<td background="<!-- TMPL_VAR Name="image" -->">
-						<B> MEMBERSHIP DETAILS </B>
+					<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+						<td background="<!-- TMPL_VAR NAME="image" -->">
+						<b> MEMBERSHIP DETAILS </b>
 						</td>
 						<td>
 						&nbsp;
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>Membership Number</B>
+						<b>Membership Number</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="bornum" -->
+						<!-- TMPL_VAR NAME="bornum" -->
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>Date of birth</B>
+						<b>Date of birth</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="dob" -->
+						<!-- TMPL_VAR NAME="dob" -->
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>Sex</B>
+						<b>Sex</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="sex" -->
+						<!-- TMPL_VAR NAME="sex" -->
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>School</B>
+						<b>School</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="school" -->
+						<!-- TMPL_VAR NAME="school" -->
 						</td>
 					</tr>
-					<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 						<td>
-						<B>General Notes</B>
+						<b>General Notes</b>
 						</td>
 						<td>
-						<!-- TMPL_VAR Name="notes" -->
+						<!-- TMPL_VAR NAME="notes" -->
 						</td>
 					</tr>
-				</TABLE><p>
+				</table><p>
 			<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
-		<form action="/cgi-bin/koha/members/insertjdata.pl" method=post>
-			<!-- TMPL_LOOP NAME=inputsloop -->
-				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		<form action="/cgi-bin/koha/members/insertjdata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value="submit" class="button members">
+			<input type="submit" name="submit" value="submit" class="button members">
 		</form>
 	<!-- /TMPL_IF -->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl
index 043cc16c2d..102f774367 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl
@@ -1,98 +1,98 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 
 <!-- TMPL_IF Name="OK" -->
-	<H1> Confirm Record </H1>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> NEW MEMBER </B>
+	<h1> Confirm Record </h1>
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> NEW MEMBER </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Name</B>
+				<b>Name</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="name" -->
+				<!-- TMPL_VAR NAME="name" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> MEMBERSHIP DETAILS </B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> MEMBERSHIP DETAILS </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Membership Number</B>
+				<b>Membership Number</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornum" -->
+				<!-- TMPL_VAR NAME="bornum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Card number</B>
+				<b>Card number</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="cardnum" -->
+				<!-- TMPL_VAR NAME="cardnum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Membership Category</B>
+				<b>Membership Category</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="memcat" -->
+				<!-- TMPL_VAR NAME="memcat" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Fee</B>
+				<b>Fee</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="fee" -->
+				<!-- TMPL_VAR NAME="fee" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Joining Date</B>
+				<b>Joining Date</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="joindate" -->
+				<!-- TMPL_VAR NAME="joindate" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Expiry Date</B>
+				<b>Expiry Date</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="expdate" -->
+				<!-- TMPL_VAR NAME="expdate" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Joining Branch</B>
+				<b>Joining Branch</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="branchcode" -->
+				<!-- TMPL_VAR NAME="branchcode" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>PERSONAL DETAILS</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>PERSONAL DETAILS</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Date of birth</B>
+				<b>Date of birth</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="dob" -->
+				<!-- TMPL_VAR NAME="dob" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Sex</B>
+				<b>Sex</b>
 			</td>
 			<td>
 				<!-- TMPL_IF Name="sex" -->
@@ -102,151 +102,151 @@
 				<!-- /TMPL_IF -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>MEMBER ADDRESS</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>MEMBER ADDRESS</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Postal Address</B>
+				<b>Postal Address</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="postal" -->
+				<!-- TMPL_VAR NAME="postal" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Home Address</B>
+				<b>Home Address</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="home" -->
+				<!-- TMPL_VAR NAME="home" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>MEMBER CONTACT DETAIL</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>MEMBER CONTACT DETAIL</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone home</B>
+				<b>Phone home</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phone" -->
+				<!-- TMPL_VAR NAME="phone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone daytime</B>
+				<b>Phone daytime</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phoneday" -->
+				<!-- TMPL_VAR NAME="phoneday" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Fax</B>
+				<b>Fax</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="faxnumber" -->
+				<!-- TMPL_VAR NAME="faxnumber" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>E-mail</B>
+				<b>E-mail</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="emailaddress" -->
+				<!-- TMPL_VAR NAME="emailaddress" -->
 			</td>
 		</tr>
-                <tr valign=top bgcolor="white" >
+                <tr valign="top" bgcolor="white" >
                         <td>
-                                <B>Text messaging</B>
+                                <b>Text messaging</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME=textmessaging -->
+				<!-- TMPL_VAR NAME="textmessaging" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>ALTERNATIVE CONTACT DETAIL</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>ALTERNATIVE CONTACT DETAIL</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Name</B>
+				<b>Name</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="contactname" -->
+				<!-- TMPL_VAR NAME="contactname" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Phone</B>
+				<b>Phone</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altphone" -->
+				<!-- TMPL_VAR NAME="altphone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Relationship</B>
+				<b>Relationship</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altrelationship" -->
+				<!-- TMPL_VAR NAME="altrelationship" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Notes</B>
+				<b>Notes</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altnotes" -->
+				<!-- TMPL_VAR NAME="altnotes" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>NOTES</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>NOTES</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>General Notes</B>
+				<b>General Notes</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornotes" -->
+				<!-- TMPL_VAR NAME="bornotes" -->
 			</td>
 		</tr>
-		</TABLE><p>
-		<form action="/cgi-bin/koha/members/insertdata.pl" method=post>
-			<!-- TMPL_LOOP NAME=inputsloop -->
-				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		</table><p>
+		<form action="/cgi-bin/koha/members/insertdata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value=Submit>
+			<input type="submit" name="submit" value="Submit">
 		</form>
 <!-- TMPL_ELSE -->
-	<h1>ERROR</H1>
+	<h1>ERROR</h1>
 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
-	<!-- TMPL_IF name="cardnumber" -->
+	<!-- TMPL_IF NAME="cardnumber" -->
 		Card number<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="invalid_cardnumber" -->
+	<!-- TMPL_IF NAME="invalid_cardnumber" -->
 		Invalid cardnumber<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="gender" -->
+	<!-- TMPL_IF NAME="gender" -->
 		Gender<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="firstname" -->
+	<!-- TMPL_IF NAME="firstname" -->
 		Given Names<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="surname" -->
+	<!-- TMPL_IF NAME="surname" -->
 		Surname<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="address" -->
+	<!-- TMPL_IF NAME="address" -->
 		Postal Street Address<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="city" -->
+	<!-- TMPL_IF NAME="city" -->
 		Postal city<br/>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
index 38627dbd8f..733ec1f02f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl
@@ -1,35 +1,35 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 <div id="mainbloc">
-<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
+<h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 
 	<form action="/cgi-bin/koha/pay.pl" method="post">
 <table cellspacing="0" cellpadding="5" border="1">
 <tr valign="top">
-	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><B>FINES &amp; CHARGES</b></td>
-	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><B>AMOUNT OWING</b></td>
+	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>FINES &amp; CHARGES</b></td>
+	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>AMOUNT OWING</b></td>
 </tr>
 	
-<!-- TMPL_LOOP name="loop_pay" -->
+<!-- TMPL_LOOP NAME="loop_pay" -->
 <tr valign="top">
-	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked">Unpaid
-	<input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="yes">Pay
-	<input type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="wo">Writeoff
-	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
-	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
-	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
-	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->">
-	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->">
-	<input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->">
+	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
+	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
+	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
+	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
+	<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
+	<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
+	<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+	<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
 	</td>
-	<td><!-- TMPL_VAR name="description" --> <!-- TMPL_VAR name="title" --></td>
-	<td><!-- TMPL_VAR name="accounttype" --></td>
-	<td><!-- TMPL_VAR name="amount" --></td>
-	<td><!-- TMPL_VAR name="amountoutstanding" --></td>
+	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
+	<td><!-- TMPL_VAR NAME="accounttype" --></td>
+	<td><!-- TMPL_VAR NAME="amount" --></td>
+	<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
 <tr valign="top">
 	<td colspan="4" align="right"><b>Total Due</b></td>
-	<td><b><!-- TMPL_VAR name="total" --></b></td>
+	<td><b><!-- TMPL_VAR NAME="total" --></b></td>
 	</tr>
 	<tr valign="top">
 	<td colspan="5" align="right">
@@ -38,7 +38,7 @@
 </table>
 </form>
 
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Member Record
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
 </div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index 85b4f4b6c0..c90aed038b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -4,50 +4,50 @@
 <p>Member Number: <!-- TMPL_VAR NAME="bornum" --></p>
 <p>Card number: <!-- TMPL_VAR NAME="cardnumber" --></p>
 
-<!-- TMPL_IF NAME=showfulllink -->
-<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Full output</a></p>
+<!-- TMPL_IF NAME="showfulllink" -->
+<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Full output</a></p>
 <!-- /TMPL_IF -->
 
 <table cellspacing="0"  cellpadding="5" border="1">
 <tr valign="top">
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>TITLE</b></a>
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=title&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>TITLE</b></a>
 	</td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>AUTHOR</b></a>
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>AUTHOR</b></a>
 	</td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>DATE DUE</b></a>
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>DATE DUE</b></a>
 	</td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR name="limit" -->"><b>RETURNED</b></a>
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->"><b>RETURNED</b></a>
 	</td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+	<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
 		<b>Volume</b>
 	</td>
 </tr>
-<!-- TMPL_LOOP name="loop_reading" -->
+<!-- TMPL_LOOP NAME="loop_reading" -->
 <tr valign="top">
 	<td bgcolor="white"><!-- TMPL_VAR NAME="biblionumber" -->
- 		<!-- TMPL_VAR name="title" -->&nbsp;
+ 		<!-- TMPL_VAR NAME="title" -->&nbsp;
 	</td>
 	<td bgcolor="white">
- 		<!-- TMPL_VAR name="author" -->&nbsp;
+ 		<!-- TMPL_VAR NAME="author" -->&nbsp;
 	</td>
 	<td bgcolor="white">
-		<!-- TMPL_VAR name="date_due" -->&nbsp;
+		<!-- TMPL_VAR NAME="date_due" -->&nbsp;
 	</td>
 	<td bgcolor="white">
-		<!-- TMPL_VAR name="returndate" -->&nbsp;
+		<!-- TMPL_VAR NAME="returndate" -->&nbsp;
 	</td>
 	<td bgcolor="white">
-		<!-- TMPL_VAR name="volumeddesc" -->&nbsp;
+		<!-- TMPL_VAR NAME="volumeddesc" -->&nbsp;
 	</td>
 <!-- /TMPL_LOOP -->
-</TABLE>
+</table>
 
 <br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Return</a> to Member Record
+<a href="moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->