diff --git a/.gitattributes b/.gitattributes
index 9ea9afb4..4e2bcc49 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -76,8 +76,7 @@ bureau/admin/adm_panel.php -text
 bureau/admin/adm_passpolicy.php -text
 bureau/admin/adm_quotadoedit.php -text
 bureau/admin/adm_quotaedit.php -text
-bureau/admin/adm_slaveaccount.php -text
-bureau/admin/adm_slaveip.php -text
+bureau/admin/adm_slavedns.php -text
 bureau/admin/adm_tld.php -text
 bureau/admin/adm_tldadd.php -text
 bureau/admin/adm_tlddoadd.php -text
diff --git a/bureau/admin/adm_slaveaccount.php b/bureau/admin/adm_slaveaccount.php
deleted file mode 100644
index 22f23713..00000000
--- a/bureau/admin/adm_slaveaccount.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
- $Id: adm_slaveaccount.php,v 1.2 2006/02/17 18:57:02 olivier Exp $
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Original Author of file: Benjamin Sonntag
- Purpose of file: Manage list of allowed accounts for zone transfers
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-
-if (!$admin->enabled) {
-	__("This page is restricted to authorized staff");
-	exit();
-}
-
-$fields = array (
-	"delaccount"   => array ("request", "string", ""),
-
-	"newlogin"   => array ("request", "string", ""),
-	"newpass"    => array ("request", "string", ""),
-);
-getFields($fields);
-
-if ($delaccount) {
-	// Delete an account
-	if ($dom->del_slave_account($delaccount)) {
-		$error=_("The requested account has been deleted. It is now denied.");
-	}
-}
-if ($newlogin) {
-	// Add an account
-	if ($dom->add_slave_account($newlogin,$newpass)) {
-		$error=_("The requested account address has been created. It is now allowed.");
-		unset($newlogin); unset($newpass);
-	}
-}
-
-include_once ("head.php");
-
-?>
-<h3><?php __("Manage allowed accounts for slave zone transfers"); ?></h3>
-<hr id="topbar"/>
-<br />
-<?php
-	if (isset($error) && $error) {
-	  echo "<p class=\"error\">$error</p>";
-	}
-
-$c=$dom->enum_slave_account();
-
-if (is_array($c)) {
-
-?>
-<p>
-<?php __("Here is the list of the allowed accounts for slave dns synchronization. You can configure the alternc-slavedns package on your slave server and give him the login/pass that will grant him access to your server's domain list. "); ?>
-</p>
-
-<table class="tlist">
-<tr><th><?php __("Action"); ?></th><th><?php __("Login"); ?></th><th><?php __("Password"); ?></th></tr>
-<?php
-$col=1;
-for($i=0;$i<count($c);$i++) {
- $col=3-$col;
-?>
-
-<tr class="lst<?php echo $col; ?>">
-   <td class="center"><div class="ina delete"><a href="adm_slaveaccount.php?delaccount=<?php echo urlencode($c[$i]["login"]); ?>"><?php __("Delete"); ?></a></div></td>
-  <td><?php ehe($c[$i]["login"]); ?></td>
-  <td><?php ehe($c[$i]["pass"]); ?></td>
-</tr>
-<?php
-}
-?>
-</table>
-    <?php } ?>
-<p><?php __("If you want to allow a new server to access your domain list, give him an account."); ?></p>
-<form method="post" action="adm_slaveaccount.php" name="main" id="main">
-<table class="tedit">
-<tr><th><label for="newlogin"><?php __("Login"); ?></label></th><th><label for="newpass"><?php __("Password"); ?></label></th></tr>
-<tr>
-	<td><input type="text" class="int" value="<?php ehe(  isset($newlogin)?$newlogin:'') ; ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /><br/><br/></td>
-	<td><input type="password" class="int" value="<?php ehe( (isset($newpass)?$newpass:'') ) ; ?>" id="newpass" name="newpass" maxlength="64" size="32" /><?php display_div_generate_password(DEFAULT_PASS_SIZE,"#newpass"); ?></td>
-</tr>
-<tr class="trbtn"><td colspan="2">
-	<input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" />
-  </td></tr>
-</table>
-<script type="text/javascript">
-document.forms['main'].newlogin.focus();
-document.forms['main'].setAttribute('autocomplete', 'off');
-</script>
-
-</form>
-<?php include_once("foot.php"); ?>
diff --git a/bureau/admin/adm_slavedns.php b/bureau/admin/adm_slavedns.php
new file mode 100644
index 00000000..00a1b437
--- /dev/null
+++ b/bureau/admin/adm_slavedns.php
@@ -0,0 +1,176 @@
+<?php
+/*
+   $Id: adm_slaveip.php,v 1.2 2004/06/02 13:03:13 anonymous Exp $
+   ----------------------------------------------------------------------
+   AlternC - Web Hosting System
+   Copyright (C) 2002 by the AlternC Development Team.
+   http://alternc.org/
+   ----------------------------------------------------------------------
+   Based on:
+   Valentin Lacambre's web hosting softwares: http://altern.org/
+   ----------------------------------------------------------------------
+   LICENSE
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License (GPL)
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   To read the license please visit http://www.gnu.org/copyleft/gpl.html
+   ----------------------------------------------------------------------
+   Original Author of file: Benjamin Sonntag
+   Purpose of file: Manage list of allowed ip for zone transfers
+   ----------------------------------------------------------------------
+ */
+require_once("../class/config.php");
+
+if (!$admin->enabled) {
+  __("This page is restricted to authorized staff");
+  exit();
+}
+
+$fields = array (
+    "delaccount"   => array ("request", "string", ""),
+    "newlogin"   => array ("request", "string", ""),
+    "newpass"    => array ("request", "string", ""),
+
+    "delip"   => array ("request", "string", ""),
+    "newip"    => array ("request", "string", ""),
+    "newclass" => array ("request", "string", "32"),
+    );
+getFields($fields);
+
+if ($delaccount) {
+  // Delete an account
+  if ($dom->del_slave_account($delaccount)) {
+    $error=_("The requested account has been deleted. It is now denied.");
+  }
+}
+if ($newlogin) {
+  // Add an account
+  if ($dom->add_slave_account($newlogin,$newpass)) {
+    $error=_("The requested account address has been created. It is now allowed.");
+    unset($newlogin); unset($newpass);
+  }
+}
+
+if ($delip) {
+  // Delete an ip address/class
+  if ($dom->del_slave_ip($delip)) {
+    $error=_("The requested ip address has been deleted. It will be denied in one hour.");
+  }
+}
+if ($newip) {
+  // Add an ip address/class
+  if ($dom->add_slave_ip($newip,$newclass)) {
+    $error=_("The requested ip address has been added to the list. It will be allowed in one hour.");
+    unset($newip); unset($newclass);
+  }
+}
+
+include_once("head.php");
+
+if (!empty($error)) {
+  echo "<p class=\"error\">$error</p>";
+}
+
+?>
+<h3><?php __("Manage allowed ip for slave zone transfers"); ?></h3>
+<hr id="topbar" />
+<?php
+
+$c=$dom->enum_slave_ip();
+
+if (is_array($c)) { ?>
+  <p>
+  <?php __("Here is the list of the allowed ip or ip class for slave dns zone transfer requests (AXFR). You must add the ip address of all the slave DNS you have so that those slaves will be allowed to transfer the zone files. There is also some defaults ip from DNS checks made by some third-party technical offices such as afnic (for .fr domains)"); ?>
+  </p>
+
+  <table border="0" cellpadding="4" cellspacing="0" class='tlist'>
+  <tr><th><?php __("Action"); ?></th><th><?php __("IP Address"); ?></th></tr>
+  <?php
+  $col=1;
+  for($i=0;$i<count($c);$i++) {
+    $col=3-$col;
+    ?>
+
+      <tr class="lst<?php echo $col; ?>">
+      <td class="center"><div class="ina delete"><a href="adm_slavedns.php?delip=<?php echo urlencode($c[$i]['ip']); ?>"><?php __("Delete"); ?></a></div></td>
+      <td><?php echo $c[$i]["ip"]."/".$c[$i]["class"]; ?></td>
+      </tr>
+      <?php
+  } //for 
+  ?>
+  </table>
+<?php }  // is_array ($c) ?>
+
+<p><?php __("If you want to allow an ip address or class to connect to your dns server, enter it here. Choose 32 as a prefix for single ip address."); ?></p>
+
+<form method="post" action="adm_slavedns.php" name="main" id="main">
+  <table class="tedit">
+    <tr><th><label for="newip"><?php __("IP Address"); ?></label></th><th><label for="newclass"><?php __("Prefix"); ?></label></th></tr>
+    <tr>
+      <td style="text-align: right"><input type="text" class="int" value="<?php ehe( (isset($newip)?$newip:'') ); ?>" id="newip" name="newip" maxlength="15" size="20" style="text-align:right" /> / </td>
+      <td><input type="text" class="int" value="<?php ehe( (isset($newclass)?$newclass:'') ); ?>" id="newclass" name="newclass" maxlength="2" size="3" /></td>
+    </tr>
+    <tr>
+      <td colspan="2"><input type="submit" value="<?php __("Add this ip to the slave list"); ?>" class="inb" /></td>
+    </tr>
+  </table>
+</form>
+
+<br/>
+<br/>
+<hr/>
+
+<h3><?php __("Manage allowed accounts for slave zone transfers"); ?></h3>
+<hr id="topbar"/>
+<br />
+
+<?php
+$c=$dom->enum_slave_account();
+
+if (is_array($c)) { ?>
+  <p><?php __("Here is the list of the allowed accounts for slave dns synchronization. You can configure the alternc-slavedns package on your slave server and give him the login/pass that will grant him access to your server's domain list. "); ?></p>
+
+ <table class="tlist">
+    <tr><th><?php __("Action"); ?></th><th><?php __("Login"); ?></th><th><?php __("Password"); ?></th></tr>
+    <?php
+    $col=1;
+    for($i=0;$i<count($c);$i++) {
+      $col=3-$col; ?>
+
+      <tr class="lst<?php echo $col; ?>">
+        <td class="center"><div class="ina delete"><a href="adm_slavedns.php?delaccount=<?php echo urlencode($c[$i]["login"]); ?>"><?php __("Delete"); ?></a></div></td>
+        <td><?php ehe($c[$i]["login"]); ?></td>
+        <td><?php ehe($c[$i]["pass"]); ?></td>
+      </tr>
+      <?php
+  } // for ?>
+</table>
+<?php } // is_array ?>
+
+<p><?php __("If you want to allow a new server to access your domain list, give him an account."); ?></p>
+
+<form method="post" action="adm_slavedns.php" name="main" id="main">
+  <table class="tedit">
+    <tr><th><label for="newlogin"><?php __("Login"); ?></label></th><th><label for="newpass"><?php __("Password"); ?></label></th></tr>
+    <tr>
+      <td><input type="text" class="int" value="<?php ehe(  isset($newlogin)?$newlogin:'') ; ?>" id="newlogin" name="newlogin" maxlength="64" size="32" /><br/><br/></td>
+      <td><input type="password" class="int" value="<?php ehe( (isset($newpass)?$newpass:'') ) ; ?>" id="newpass" name="newpass" maxlength="64" size="32" /><?php display_div_generate_password(DEFAULT_PASS_SIZE,"#newpass"); ?></td>
+    </tr>
+    <tr class="trbtn"><td colspan="2"><input type="submit" value="<?php __("Add this account to the allowed list"); ?>" class="inb" /></td></tr>
+  </table>
+</form>
+
+<script type="text/javascript">
+  document.forms['main'].setAttribute('autocomplete', 'off');
+  document.forms['main'].newip.focus();
+</script>
+
+<?php include_once("foot.php"); ?>
diff --git a/bureau/admin/adm_slaveip.php b/bureau/admin/adm_slaveip.php
deleted file mode 100644
index 6356ad08..00000000
--- a/bureau/admin/adm_slaveip.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- $Id: adm_slaveip.php,v 1.2 2004/06/02 13:03:13 anonymous Exp $
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Original Author of file: Benjamin Sonntag
- Purpose of file: Manage list of allowed ip for zone transfers
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-
-if (!$admin->enabled) {
-	__("This page is restricted to authorized staff");
-	exit();
-}
-
-$fields = array (
-	"delip"   => array ("request", "string", ""),
-	"newip"    => array ("request", "string", ""),
-	"newclass" => array ("request", "string", "32"),
-);
-getFields($fields);
-
-if ($delip) {
-	// Delete an ip address/class
-	if ($dom->del_slave_ip($delip)) {
-		$error=_("The requested ip address has been deleted. It will be denied in one hour.");
-	}
-}
-if ($newip) {
-	// Add an ip address/class
-	if ($dom->add_slave_ip($newip,$newclass)) {
-		$error=_("The requested ip address has been added to the list. It will be allowed in one hour.");
-		unset($newip); unset($newclass);
-	}
-}
-
-include_once("head.php");
-
-?>
-<h3><?php __("Manage allowed ip for slave zone transfers"); ?></h3>
-<hr id="topbar" />
-<br />
-<?php
-	if (isset($error) && $error) {
-	  echo "<p class=\"error\">$error</p>";
-	}
-
-$c=$dom->enum_slave_ip();
-
-if (is_array($c)) {
-
-?>
-<p>
-<?php __("Here is the list of the allowed ip or ip class for slave dns zone transfer requests (AXFR). You must add the ip address of all the slave DNS you have so that those slaves will be allowed to transfer the zone files. There is also some defaults ip from DNS checks made by some third-party technical offices such as afnic (for .fr domains)"); ?>
-</p>
-
-<table border="0" cellpadding="4" cellspacing="0" class='tlist'>
-<tr><th><?php __("Action"); ?></th><th><?php __("IP Address"); ?></th></tr>
-<?php
-$col=1;
-for($i=0;$i<count($c);$i++) {
- $col=3-$col;
-?>
-
-<tr class="lst<?php echo $col; ?>">
-   <td class="center"><div class="ina delete"><a href="adm_slaveip.php?delip=<?php echo urlencode($c[$i]['ip']); ?>"><?php __("Delete"); ?></a></div></td>
-<td><?php echo $c[$i]["ip"]."/".$c[$i]["class"]; ?></td>
-</tr>
-<?php
-}
-?>
-</table>
-    <?php } ?>
-<p><?php __("If you want to allow an ip address or class to connect to your dns server, enter it here. Choose 32 as a prefix for single ip address."); ?></p>
-<form method="post" action="adm_slaveip.php" name="main" id="main">
-<table class="tedit">
-<tr><th><label for="newip"><?php __("IP Address"); ?></label></th><th><label for="newclass"><?php __("Prefix"); ?></label></th></tr>
-<tr>
-  <td style="text-align: right"><input type="text" class="int" value="<?php ehe( (isset($newip)?$newip:'') ); ?>" id="newip" name="newip" maxlength="15" size="20" style="text-align:right" /> / </td>
-  <td><input type="text" class="int" value="<?php ehe( (isset($newclass)?$newclass:'') ); ?>" id="newclass" name="newclass" maxlength="2" size="3" /></td>
-</tr>
-<tr><td colspan="2">
-  <input type="submit" value="<?php __("Add this ip to the slave list"); ?>" class="inb" />
-</td></tr>
-</table>
-</form>
-<script type="text/javascript">
-document.forms['main'].newip.focus();
-</script>
-
-<?php include_once("foot.php"); ?>