diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
index aa84ad3ac9..a3096110a6 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl
@@ -8,23 +8,36 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 
 <div class="tabbed">
-	<form method="post" name="f">
-	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
+	<form method="post" action="authorities.pl" name="f">
+	<!-- TMPL_IF name="authid" -->
+		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
+	<!-- TMPL_ELSE -->
+		<h1>Adding authority <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
+	<!-- /TMPL_IF -->
 	<p>
-		<input type="hidden" name="op" value="add">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
+		<input type="hidden" name="op" value="add" />
+		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
 		<!-- TMPL_IF name="authid" -->
-			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
+			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
+			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
 		<!-- /TMPL_IF -->
 <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
 	</p>
 </div>
 
-<br><br><br><br><br><br><br><br><br><br><br>
+<!-- TMPL_IF name="duplicateauthid" -->
+	<div class="error">
+		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+		<p>You must either :</p>
+		<ul>
+			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
+		</ul>
+	</div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_LOOP NAME="0XX" -->
 	<!-- TMPL_IF name="tag" -->
@@ -171,8 +184,8 @@ function PopupZ3950() {
 }
 
 function AddField(field) {
-	document.forms[0].op.value = "addfield";
-	document.forms[0].addfield_field.value=field;
+	document.forms[1].op.value = "addfield";
+	document.forms[1].addfield_field.value=field;
 	document.f.submit();
 }
 </script>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl
index 98017e94c4..7f363c1216 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl
@@ -7,7 +7,7 @@
 <div id="main">
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 <div class="tabbed">
-	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
+	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
 	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
 		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
 	</a>
@@ -41,9 +41,9 @@
 <script language="JavaScript" type="text/javascript">
 
 function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	var is_confirmed = confirm('Are you sure you want to delete this authority?');
 	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
+		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
 	}
 }
 function Dopop(link) {