diff --git a/bureau/admin/mail_alias_doedit.php b/bureau/admin/mail_alias_doedit.php
index 552cb728..5c835cd0 100644
--- a/bureau/admin/mail_alias_doedit.php
+++ b/bureau/admin/mail_alias_doedit.php
@@ -28,7 +28,7 @@
 */
 require_once("../class/config.php");
 $fields = array (
-	"alias" => array ("request", "string",0),
+	"mail_arg" => array ("request", "string",0),
 	"mail_id" => array ("request", "integer",0),
 	"domain" => array ("request", "string",0),
 	"address_full" => array ("request", "string",0),
@@ -38,12 +38,12 @@ $fields = array (
 getFields($fields);
 
 $alias_retour=array ();
-$alias_retour=$mail->create($dom_id,$alias);
+$alias_retour=$mail->create($dom_id,$mail_arg);
 //setting up the alias.
 if(!$mail_alias->setalias($alias_retour["mail_id"],$address_full)){
 //if fails redirect to creation with error message.
-$error=sprintf(_("Alias: %s already created"), $alias);
-include("mail_alias_create.php");
+$error=sprintf(_("Alias: %s already created"), $mail_arg);
+include("mail_alias_create.inc.php");
 }else{
 //redirection to the properties list.
 header ("Location: mail_properties.php?mail_id=$mail_id");
diff --git a/bureau/admin/mail_localbox_doedit.php b/bureau/admin/mail_localbox_doedit.php
index d568707a..8589f532 100644
--- a/bureau/admin/mail_localbox_doedit.php
+++ b/bureau/admin/mail_localbox_doedit.php
@@ -51,8 +51,7 @@ if(isset($is_local) && intval($is_local) == 1){
 	//if user chose yes to localbox
 	if($local == 1){
 		$error = _("Already Activated");
-		include ("mail_edit.php");
-		exit();
+		header ("Location: /mail_properties.php?mail_id=$mail_id");
 	}else{
 		$mail_localbox->unset_localbox($mail_id);
 		header ("Location: /mail_properties.php?mail_id=$mail_id");
@@ -60,9 +59,8 @@ if(isset($is_local) && intval($is_local) == 1){
 }elseif( intval($is_local) == 0 ){
 
 	if($local == 0){
-		$error = _("Already Activated");
-		include ("mail_edit.php");
-		exit();
+		$error = _("Already disactivated");
+		header ("Location: /mail_properties.php?mail_id=$mail_id");
 	}else{
 		//echo "processing mail to localbox";
 		$mail_localbox->set_localbox($mail_id);
diff --git a/bureau/class/m_mail_alias.php b/bureau/class/m_mail_alias.php
index e033112e..77bfac11 100644
--- a/bureau/class/m_mail_alias.php
+++ b/bureau/class/m_mail_alias.php
@@ -75,7 +75,8 @@ Class m_mail_alias{
   function form($mail_id, $edit_id) {
     global $mail,$err;
     if ($edit_id) {
-      echo "<a href='mail_redirection_edit.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
+      //echo "<a href='mail_redirection_edit.inc.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
+      echo "<a href='mail_properties.php?mail_id=$edit_id'>";__("Edit");echo "</a>";
     } else {
       include('mail_alias_create.inc.php');
     }
diff --git a/etc/alternc/templates/postfix/myquota.cf b/etc/alternc/templates/postfix/myquota.cf
index a21c7271..fc06c7cd 100644
--- a/etc/alternc/templates/postfix/myquota.cf
+++ b/etc/alternc/templates/postfix/myquota.cf
@@ -3,9 +3,9 @@
 # Get the quota
 #
 
-user = sysusr
-password = bGwD2GlLOX
-hosts =127.0.0.1
-dbname = alternc
+user = %%db_mail_user%%
+password = %%db_mail_pwd%%
+hosts =%%dbhost%%
+dbname = %%dbname%%
 query = select quota from mailbox join address on mailbox.id = address.id join domaines on domaines.id = address.id where concat(address.address,'@',domaines.domaine) = '%s'
 
diff --git a/install/alternc.install b/install/alternc.install
index 1102d3e0..2f065e51 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -295,7 +295,7 @@ grep -v '^\ *#' $postfix_conf |while read line ; do
 done 
 
 # Conviguring delivery used bu Postfix FIXME change script name
-echo `/usr/bin/postfix-add-policy dovecot vmail:vmail DRhu pipe'/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
+echo `/usr/bin/postfix-add-policy dovecot vmail:vmail DRhu pipe '/usr/bin/sudo /usr/lib/dovecot/deliver -f ${sender} -d ${recipient} '`
 
 # Bug #1215: configure mydestination when $FQDN is not in
 OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`