diff --git a/koha-tmpl/intranet-tmpl/ccfls/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/ccfls/en/members/memberentry.tmpl
index a0dee88f2d..c5734ea6e6 100644
--- a/koha-tmpl/intranet-tmpl/ccfls/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/ccfls/en/members/memberentry.tmpl
@@ -1,215 +1,215 @@
-<!-- TMPL_INCLUDE NAME="head.inc" -->
-<!-- TMPL_INCLUDE NAME="body-top.inc" -->
-<!-- TMPL_INCLUDE NAME="body-top-members.inc" -->
-
-<!-- TMPL_IF NAME="institution" -->
-	<div id="subTab-1">
-		<a href="/cgi-bin/koha/members/members-home.pl">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-search-unselected.png" border="0" />
-		</a>
-	</div>
-	
-	<div id="subTab-2">
-		<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addMember-unselected.png" border="0" />
-		</a>
-	</div>
-	
-	<div id="subTab-3">
-		<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addOrganization-selected.png" border="0" />
-		</a>
-	</div>
-<!-- TMPL_ELSE -->
-	<div id="subTab-1">
-		<a href="/cgi-bin/koha/members/members-home.pl">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-search-unselected.png" border="0" />
-		</a>
-	</div>
-	
-	<div id="subTab-2">
-		<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addMember-selected.png" border="0" />
-		</a>
-	</div>
-	
-	<div id="subTab-3">
-		<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add">
-			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addOrganization-unselected.png" border="0" />
-		</a>
-	</div>
-<!-- /TMPL_IF -->
-
-<dl>
-<dt>Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron<!-- /TMPL_IF -->
-</dt>
-<dd>
-
-<div id="main">
-	<!-- TMPL_IF NAME="addAction" -->
-	<h1>
-		Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron
-	</h1>
-	<!-- TMPL_ELSE -->
-	<h1>
-		Update <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron Details
-</h1><h2><!-- TMPL_IF NAME="surname" --><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --></h2>
-	<!-- /TMPL_IF -->
-
-	<!-- TMPL_IF Name="NOK" -->
-		
-		<div class="error">
-		<h3>Missing Information</h3>
-			<p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
-			<!-- TMPL_IF NAME="ERROR_surname" -->
-				<li><a href="#lastname">Last Name</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_firstname" -->
-				<li><a href="#firstname">First Name</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_gender" -->
-				<li><a href="#sex">Sex</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_address" -->
-				<li><a href="#address">Mailing Address</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_city" -->
-				<li><a href="#city">Mailing Address City/State</a><br>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
-				<li><a href="#cardnumber">Card Number</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
-				<li><a href="#cardnumber">Invalid Card Number</a></li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ERROR_branch" -->
-				<li><a href="#branch">Patron must be at the same branch as you</a></li>
-			<!-- /TMPL_IF -->
-			</ul>
-		</div>
-	<!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-		<!-- TMPL_IF NAME="addAction" -->
-			<input type="hidden" name="op" value="add">
-		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
-		<!-- /TMPL_IF -->
-<div class="table members"><table>
-
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
-				<select name="title" id="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>
-				</td></tr><!-- /TMPL_UNLESS -->
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="initials">Initials:</label></th><td colspan="4"><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
-
-	<tr><th><label for="surname"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->><a name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->></td>
-
-<!-- TMPL_UNLESS name="institution" --><th><label for="sex"<!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->><a name="sex" id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->>F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->> M</td><!-- /TMPL_UNLESS -->
-</tr>
-
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> </th><td><input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td>
-
-<!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
-</tr><!-- /TMPL_UNLESS -->
-					
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
-
-	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
-<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
-<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
-
-<fieldset><legend>Street Address (if different)</legend>
-<label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
-<br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
-<br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
-</fieldset>
-</td></tr>
-
-	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
-	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
-	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
-	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
-			</tr>
-	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
-	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
-
-			<tr>
-				<!-- TMPL_IF NAME="addAction" -->
-					<th>Joining date (leave blank for today): </th>
-					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
-				<!-- TMPL_ELSE -->
-					<th>Joining date: </th>
-					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
-				<!-- /TMPL_IF -->
-			</tr>
-			<tr>
-				<th>Expiry date (leave blank for auto calc): </th>
-				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
-			</tr>
-
-			</table></div>
-
-
-<!-- TMPL_UNLESS name="institution" -->
-		<div class="table members"><table>
-		<caption>Alternate Contact</caption>
-		<tr><th><label for="contactname">Name: </label></th><td><input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td></tr>
-		<tr><th><label for="altphone">Phone:</label> </th><td><input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td></tr>
-		<tr><th><label for="altrelationship">Relationship:</label> </th><td><select id="altrelationship" name="altrelationship" size="1">
-					<!-- TMPL_LOOP NAME="relshiploop" -->
-						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-					<!-- /TMPL_LOOP -->
-					</select></td></tr>
-		<tr><th><label for="altnotes">Notes: </label></th><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td></tr>
-		</table></div><!-- /TMPL_UNLESS -->
-
-<div class="table members"><table>
-	<caption>Flags</caption>
-	<!-- TMPL_LOOP NAME="flagloop" -->
-	<tr><th><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
-				<!-- /TMPL_LOOP -->
-</table></div>
-
-<div class="table members"><table>
-<caption>Patron Details</caption>
-	<!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
-	<tr><th><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
-	<tr><th><label for="branchcode"><a name="branch" id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
-	<tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
-</table>
-<table><caption>Additional Fields</caption>
-	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
-						<!-- TMPL_VAR Name="CGIsort1" -->
-					<!-- TMPL_ELSE -->
-						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
-					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
-	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
-						<!-- TMPL_VAR Name="CGIsort2" -->
-					<!-- TMPL_ELSE -->
-						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
-					<!--/TMPL_IF --></td></tr>
-</table>
-</div>
-
-<p>	<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
-	<input name="submit" type="submit" class="submit" value="<!-- TMPL_IF NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Patron" /></p>
-	</form>
-</div>
-
-</dd>
-</dl>
-</body>
-</html>
-
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-members.inc" -->
+
+<!-- TMPL_IF NAME="institution" -->
+	<div id="subTab-1">
+		<a href="/cgi-bin/koha/members/members-home.pl">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-search-unselected.png" border="0" />
+		</a>
+	</div>
+	
+	<div id="subTab-2">
+		<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addMember-unselected.png" border="0" />
+		</a>
+	</div>
+	
+	<div id="subTab-3">
+		<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addOrganization-selected.png" border="0" />
+		</a>
+	</div>
+<!-- TMPL_ELSE -->
+	<div id="subTab-1">
+		<a href="/cgi-bin/koha/members/members-home.pl">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-search-unselected.png" border="0" />
+		</a>
+	</div>
+	
+	<div id="subTab-2">
+		<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addMember-selected.png" border="0" />
+		</a>
+	</div>
+	
+	<div id="subTab-3">
+		<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add">
+			<img src="<!-- TMPL_VAR NAME='themelang' -->/images/subTab-members-addOrganization-unselected.png" border="0" />
+		</a>
+	</div>
+<!-- /TMPL_IF -->
+
+<dl>
+<dt>Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron<!-- /TMPL_IF -->
+</dt>
+<dd>
+
+<div id="main">
+	<!-- TMPL_IF NAME="addAction" -->
+	<h1>
+		Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron
+	</h1>
+	<!-- TMPL_ELSE -->
+	<h1>
+		Update <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron Details
+</h1><h2><!-- TMPL_IF NAME="surname" --><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="firstname" -->, <!-- TMPL_VAR name="firstname" --><!-- /TMPL_IF --></h2>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF Name="NOK" -->
+		
+		<div class="error">
+		<h3>Missing Information</h3>
+			<p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
+			<!-- TMPL_IF NAME="ERROR_surname" -->
+				<li><a href="#lastname">Last Name</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_firstname" -->
+				<li><a href="#firstname">First Name</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_gender" -->
+				<li><a href="#sex">Sex</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_address" -->
+				<li><a href="#address">Mailing Address</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_city" -->
+				<li><a href="#city">Mailing Address City/State</a><br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
+				<li><a href="#cardnumber">Card Number</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
+				<li><a href="#cardnumber">Invalid Card Number</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_branch" -->
+				<li><a href="#branch">Patron must be at the same branch as you</a></li>
+			<!-- /TMPL_IF -->
+			</ul>
+		</div>
+	<!-- /TMPL_IF -->
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+		<input type="hidden" name="type" value="borrowers">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+		<!-- TMPL_IF NAME="addAction" -->
+			<input type="hidden" name="op" value="add">
+		<!-- TMPL_ELSE -->
+			<input type="hidden" name="op" value="modify">
+		<!-- /TMPL_IF -->
+<div class="table members"><table>
+
+	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
+				<select name="title" id="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>
+				</td></tr><!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="initials">Initials:</label></th><td colspan="4"><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
+
+	<tr><th><label for="surname"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->><a name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->></td>
+
+<!-- TMPL_UNLESS name="institution" --><th><label for="sex"<!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->><a name="sex" id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->>F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->> M</td><!-- /TMPL_UNLESS -->
+</tr>
+
+	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> </th><td><input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td>
+
+<!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
+</tr><!-- /TMPL_UNLESS -->
+					
+	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+
+	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
+<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
+<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
+
+<fieldset><legend>Street Address (if different)</legend>
+<label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
+<br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
+<br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
+</fieldset>
+</td></tr>
+
+	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
+	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
+	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
+	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
+			</tr>
+	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
+	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+
+			<tr>
+				<!-- TMPL_IF NAME="addAction" -->
+					<th>Joining date (leave blank for today): </th>
+					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+				<!-- TMPL_ELSE -->
+					<th>Joining date: </th>
+					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+				<!-- /TMPL_IF -->
+			</tr>
+			<tr>
+				<th>Expiry date (leave blank for auto calc): </th>
+				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+			</tr>
+
+			</table></div>
+
+
+<!-- TMPL_UNLESS name="institution" -->
+		<div class="table members"><table>
+		<caption>Alternate Contact</caption>
+		<tr><th><label for="contactname">Name: </label></th><td><input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td></tr>
+		<tr><th><label for="altphone">Phone:</label> </th><td><input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td></tr>
+		<tr><th><label for="altrelationship">Relationship:</label> </th><td><select id="altrelationship" name="altrelationship" size="1">
+					<!-- TMPL_LOOP NAME="relshiploop" -->
+						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+					<!-- /TMPL_LOOP -->
+					</select></td></tr>
+		<tr><th><label for="altnotes">Notes: </label></th><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td></tr>
+		</table></div><!-- /TMPL_UNLESS -->
+
+<div class="table members"><table>
+	<caption>Flags</caption>
+	<!-- TMPL_LOOP NAME="flagloop" -->
+	<tr><th><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
+				<!-- /TMPL_LOOP -->
+</table></div>
+
+<div class="table members"><table>
+<caption>Patron Details</caption>
+	<!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
+	<tr><th><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
+	<tr><th><label for="branchcode"><a name="branch" id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
+	<tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
+</table>
+<table><caption>Additional Fields</caption>
+	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
+						<!-- TMPL_VAR Name="CGIsort1" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
+	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
+						<!-- TMPL_VAR Name="CGIsort2" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+					<!--/TMPL_IF --></td></tr>
+</table>
+</div>
+
+<p>	<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
+	<input name="submit" type="submit" class="submit" value="<!-- TMPL_IF NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Patron" /></p>
+	</form>
+</div>
+
+</dd>
+</dl>
+</body>
+</html>
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index c8ecb175ec..5c2d6f9e2d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -67,7 +67,7 @@
 				<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_UNLESS name="institution" -->Prefered Name<!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_UNLESS name="institution" -->Preferred Name<!-- /TMPL_UNLESS --></td>
 			</tr>
 			<tr>
 				<td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
index 44aad9a46a..82ee9f457b 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl
@@ -85,7 +85,7 @@
 <!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
 </tr><!-- /TMPL_UNLESS -->
 					
-	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
 
 	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><!-- TMPL_IF NAME="ERROR_address" --><label for="streetaddress" class="focus"><!-- TMPL_ELSE --><label for="streetaddress"><!-- /TMPL_IF --><a name="address" id="address">Address:</a> </label>
 <!-- TMPL_IF NAME="ERROR_address" -->