diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
index 6010bddae6..0450413061 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
@@ -10,7 +10,17 @@
 <form action='<TMPL_VAR name=action>' name=Aform method=post>
 <input type=hidden name=op value='add_validate'>
 <table>
-<tr><td>Branch code</td><td><input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'</td></tr>
+<tr>
+	<td>Branch code</td>
+	<td>
+		<TMPL_IF name="branchcode">
+			<input type=hidden name=branchcode value='<TMPL_VAR name=branchcode escape="HTML">'>
+			<TMPL_VAR name="branchcode">
+		<TMPL_ELSE>
+			<input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'>
+		</TMPL_IF>
+	</td>
+</tr>
 <tr><td>Name</td><td><input type=text name=branchname size=40 maxlength=80 value="<TMPL_VAR name=branchname escape="HTML">">&nbsp;</td></tr>
 <FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
 <tr><td><TMPL_VAR name=categoryname></td>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
index e4ab15bc64..464d4b4946 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl
@@ -1,63 +1,71 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-
-<TMPL_IF name="add">
-<form action='<TMPL_VAR name=action>' name=Aform method=post>
-<input type=hidden name=op value='add_validate'>
-<table>
-<tr>
-      <td>Code annexe</td>
-      <td><input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode>'></td></tr>
-<tr>
-      <td>Nom</td>
-      <td><input type=text name=branchname size=40 maxlength=80 value='<TMPL_VAR name=branchname>'}'>&nbsp;</td></tr>
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<tr><td><TMPL_VAR name=categoryname></td>
-<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" VALUE="1" ><TMPL_VAR name=codedescription></td></tr>
-<tr>
-      <td>Adresse</td>
-      <td><input type=text name=branchaddress1 value='<TMPL_VAR name=branchaddress1>'></td></tr>
-<tr><td>&nbsp;</td><td><input type=text name=branchaddress2 value='<TMPL_VAR name=branchaddress2>'></td></tr>
-<tr><td>&nbsp;</td><td><input type=text name=branchaddress3 value='<TMPL_VAR name=branchaddress3>'></td></tr>
-<tr>
-      <td>T&eacute;l&eacute;phone</td>
-      <td><input type=text name=branchphone value='<TMPL_VAR name=branchphone>'></td></tr>
-<tr><td>Fax</td><td><input type=text name=branchfax value='<TMPL_VAR name=branchfax>'></td></tr>
-<tr><td>E-mail</td><td><input type=text name=branchemail value='<TMPL_VAR name=branchemail>'></td></tr>
-<tr><td>&nbsp;</td><td>
-        <input type=submit value='Envoyer'>
-      </td></tr> 
-</table>
-</form>
-</TMPL_IF> <TMPL_IF name="delete_confirm"> Confirmez la suppression : 
-<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value='delete_confirmed'>
-<input type='hidden' name='branchcode' value=><TMPL_VAR name=branchcode>>
-  <input type=submit value=OUI>
-</form>
-<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
-  <input type=submit value=NON>
-</form>
-</TMPL_IF>
-
-<TMPL_IF name="else">
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<font color='red'><TMPL_VAR name="message"></font>
-<form action="<TMPL_VAR name=action>" method=post><input type='hidden' name='op' value='add'>
-  <input type=submit value='Ajouter une nouvelle annexe'>
-</form>
-<table border='1' cellpadding='5' cellspacing='0' width='550'>
-<tr> 
-    <th colspan='5' align='left' bgcolor='#99cc33' background=$backgroundimage> 
-      <font size='5'><b>Annexes</b></font></th>
-  </tr> 
-<tr bgcolor='#889999'> 
-    <td width='175'><b>Nom</b></td> 
-<td width='25'><b>Code</b></td> 
-    <td width='175'><b>Adresse</b></td>
-    <td width='175'><b>Cat&eacute;gories</b></td>
-<td width='50'><b>&nbsp;</b></td>
-</tr>
-<TMPL_LOOP name="branches">
-<tr bgcolor='<TMPL_VAR name=color>'>
+<TMPL_INCLUDE NAME="cat-top.inc">
+
+<TMPL_IF name="add">
+<form action='<TMPL_VAR name=action>' name=Aform method=post>
+<input type=hidden name=op value='add_validate'>
+<table>
+<tr>
+      <td>Code annexe</td>
+      <td>
+		<TMPL_IF name="branchcode">
+			<input type=hidden name=branchcode value='<TMPL_VAR name=branchcode escape="HTML">'>
+			<TMPL_VAR name="branchcode">
+		<TMPL_ELSE>
+			<input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'>
+		</TMPL_IF>
+	</td>
+</tr>
+<tr>
+      <td>Nom</td>
+      <td><input type=text name=branchname size=40 maxlength=80 value='<TMPL_VAR name=branchname>'}'>&nbsp;</td></tr>
+<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
+<tr><td><TMPL_VAR name=categoryname></td>
+<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" VALUE="1" ><TMPL_VAR name=codedescription></td></tr>
+<tr>
+      <td>Adresse</td>
+      <td><input type=text name=branchaddress1 value='<TMPL_VAR name=branchaddress1>'></td></tr>
+<tr><td>&nbsp;</td><td><input type=text name=branchaddress2 value='<TMPL_VAR name=branchaddress2>'></td></tr>
+<tr><td>&nbsp;</td><td><input type=text name=branchaddress3 value='<TMPL_VAR name=branchaddress3>'></td></tr>
+<tr>
+      <td>T&eacute;l&eacute;phone</td>
+      <td><input type=text name=branchphone value='<TMPL_VAR name=branchphone>'></td></tr>
+<tr><td>Fax</td><td><input type=text name=branchfax value='<TMPL_VAR name=branchfax>'></td></tr>
+<tr><td>E-mail</td><td><input type=text name=branchemail value='<TMPL_VAR name=branchemail>'></td></tr>
+<tr><td>&nbsp;</td><td>
+        <input type=submit value='Envoyer'>
+      </td></tr> 
+</table>
+</form>
+</TMPL_IF> <TMPL_IF name="delete_confirm"> Confirmez la suppression : 
+<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value='delete_confirmed'>
+<input type='hidden' name='branchcode' value=><TMPL_VAR name=branchcode>>
+  <input type=submit value=OUI>
+</form>
+<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
+  <input type=submit value=NON>
+</form>
+</TMPL_IF>
+
+<TMPL_IF name="else">
+<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
+<font color='red'><TMPL_VAR name="message"></font>
+<form action="<TMPL_VAR name=action>" method=post><input type='hidden' name='op' value='add'>
+  <input type=submit value='Ajouter une nouvelle annexe'>
+</form>
+<table border='1' cellpadding='5' cellspacing='0' width='550'>
+<tr> 
+    <th colspan='5' align='left' bgcolor='#99cc33' background=$backgroundimage> 
+      <font size='5'><b>Annexes</b></font></th>
+  </tr> 
+<tr bgcolor='#889999'>
+    <td width='175'><b>Nom</b></td>
+<td width='25'><b>Code</b></td>
+    <td width='175'><b>Adresse</b></td>
+    <td width='175'><b>Cat&eacute;gories</b></td>
+<td width='50'><b>&nbsp;</b></td>
+</tr>
+<TMPL_LOOP name="branches">
+<tr bgcolor='<TMPL_VAR name=color>'>
     <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
     <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
     <td align='left' valign='top'>
@@ -87,37 +95,37 @@
 </TMPL_LOOP>
 </TMPL_IF>
     </td>
-    <td align='left' valign='top'> 
-<form action='<TMPL_VAR name=action>' method=post>
-<input type='hidden' name='op' value='edit'>
-<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
-        <input type=submit value=Modifier>
-</form>
-<form action='<TMPL_VAR name=action>' method=post>
-<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
-<input type='hidden' name='op' value='delete'>
-        <input type=submit value=Supprimer>
-</form></td>
-</tr>
-</TMPL_LOOP>
-</table>
-<br>
-<table border='1' cellpadding='5' cellspacing='0'>
-<tr> 
-    <th colspan='5' align='left' bgcolor='#99cc33' background=$backgroundimage> 
-      <font size='5'><b>Cat&eacute;gories d'annexes</b></font></th>
-  </tr> 
-<tr bgcolor='#889999'> 
-    <td width='175'><b>Nom</b></td> 
-<td width='25'><b>Code</b></td> 
-<td width='200'><b>Description</b></td>
-</tr>
-<tr bgcolor='$color'>
-    <td align='left' valign='top'><TMPL_VAR name=categoryname></td>
-    <td align='left' valign='top'><TMPL_VAR name=categorycode></td>
-    <td align='left' valign='top'><TMPL_VAR name=codedescription></td>
-</tr>
-</table>
-</TMPL_IF>
-
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+    <td align='left' valign='top'> 
+<form action='<TMPL_VAR name=action>' method=post>
+<input type='hidden' name='op' value='edit'>
+<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
+        <input type=submit value=Modifier>
+</form>
+<form action='<TMPL_VAR name=action>' method=post>
+<input type='hidden' name='branchcode' value='<TMPL_VAR name=value>'>
+<input type='hidden' name='op' value='delete'>
+        <input type=submit value=Supprimer>
+</form></td>
+</tr>
+</TMPL_LOOP>
+</table>
+<br>
+<table border='1' cellpadding='5' cellspacing='0'>
+<tr> 
+    <th colspan='5' align='left' bgcolor='#99cc33' background=$backgroundimage> 
+      <font size='5'><b>Cat&eacute;gories d'annexes</b></font></th>
+  </tr> 
+<tr bgcolor='#889999'> 
+    <td width='175'><b>Nom</b></td> 
+<td width='25'><b>Code</b></td> 
+<td width='200'><b>Description</b></td>
+</tr>
+<tr bgcolor='$color'>
+    <td align='left' valign='top'><TMPL_VAR name=categoryname></td>
+    <td align='left' valign='top'><TMPL_VAR name=categorycode></td>
+    <td align='left' valign='top'><TMPL_VAR name=codedescription></td>
+</tr>
+</table>
+</TMPL_IF>
+
+<TMPL_INCLUDE NAME="cat-bottom.inc">