diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index ad94e2ed..efe38f86 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -101,31 +101,35 @@ for($i=0;$i<$r["nsub"];$i++) {
 	$col=3-$col;
 ?>
 	<tr class="lst<?php echo $col; ?>">
+    <?php if ( $r['sub'][$i]['web_action'] =='DELETE') { echo "<td colspan=2 />"; } else { ?>
 		<td class="center">
 			<div class="ina"><a href="dom_subedit.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>&amp;type=<?php  echo urlencode($r["sub"][$i]["type"]) ?>&amp;value=<?php echo urlencode($r["sub"][$i]['dest'])?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div>
 
 			</td><td class="center">
 			<div class="ina"><a href="dom_subdel.php?domain=<?php echo urlencode($r["name"]) ?>&amp;sub=<?php  echo urlencode($r["sub"][$i]["name"]) ?>&amp;type=<?php  echo urlencode($r["sub"][$i]["type"]) ?>&amp;value=<?php echo urlencode($r["sub"][$i]['dest'])?>"><img src="images/delete.png" alt="<?php __("Delete"); ?>" /><?php __("Delete"); ?></a></div>
 		</td>
+    <?php } // end IF ==DELETE ?>
 		<td><a href="http://<?php ecif($r["sub"][$i]["name"],$r["sub"][$i]["name"]."."); echo $r["name"] ?>" target="_blank"><?php ecif($r["sub"][$i]["name"],$r["sub"][$i]["name"]."."); echo $r["name"] ?></a></td>
 		<td><?php __($r['sub'][$i]['type_desc']);?></td>
 		<td><?php echo $r["sub"][$i]['type'] === 'LOCAL' ? '<a href="bro_main.php?R='.urlencode($r["sub"][$i]["dest"]).'">'.htmlspecialchars($r["sub"][$i]["dest"]).'</a>' : htmlspecialchars($r["sub"][$i]["dest"]); ?>&nbsp;</td>
 		<td><?php 
-      switch ($r['sub'][$i]['enable']) {
-        case 'ENABLED':
-          __("Enabled");
-          echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&status=disable'>";__("Disable");echo "</a>";
-          break;
-        case 'ENABLE':
-          __("Activation pending");
-          break;
-        case 'DISABLED':
-          __("Disabled");
-          echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&status=enable'>";__("Enable");echo "</a>";
-          break;
-        case 'DISABLE':
-          __("Desactivation pending");
-          break;
+      if ( $r['sub'][$i]['web_action'] !='DELETE') { 
+        switch ($r['sub'][$i]['enable']) {
+          case 'ENABLED':
+            __("Enabled");
+            echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&status=disable'>";__("Disable");echo "</a>";
+            break;
+          case 'ENABLE':
+            __("Activation pending");
+            break;
+          case 'DISABLED':
+            __("Disabled");
+            echo "<br/><a href='dom_substatus.php?domain=".urlencode($r["name"])."&amp;sub=".urlencode($r["sub"][$i]["name"])."&amp;type=".urlencode($r["sub"][$i]["type"])."&amp;value=".urlencode($r["sub"][$i]['dest'])."&status=enable'>";__("Enable");echo "</a>";
+            break;
+          case 'DISABLE':
+            __("Desactivation pending");
+            break;
+        }
       }?></td>
 		<td><?php 
       switch ($r['sub'][$i]['web_action']) {
diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php
index b2ab0227..f13920ae 100644
--- a/bureau/class/m_dom.php
+++ b/bureau/class/m_dom.php
@@ -864,7 +864,11 @@ class m_dom {
     }
 
     // Re-create the one we want
-    $db->query("insert into sub_domaines (compte,domaine,sub,valeur,type,web_action) values ('$cuid','$dom','$sub','$dest','$type','UPDATE');");
+    if (! $db->query("insert into sub_domaines (compte,domaine,sub,valeur,type,web_action) values ('$cuid','$dom','$sub','$dest','$type','UPDATE');") ) {
+      echo "query failed: ".$db->Error;
+      return false;
+    }
+
     // Tell to update the DNS file
     $db->query("update domaines set dns_action='UPDATE' where domaine='$dom';");
 
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index a4173d7f..602032cf 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -15,13 +15,13 @@ Include /var/alternc/apache-vhost/vhosts_all.conf
 
 <VirtualHost *:80>
 # ***ALTERNC_ALIASES***
-        Alias /icons/ /usr/share/apache/icons/
+  Alias /icons/ /usr/share/apache/icons/
 
-        UseCanonicalName    Off
-        VirtualDocumentRoot /var/alternc/dns/%-2.1/%0
+  UseCanonicalName    Off
+  VirtualDocumentRoot /var/alternc/dns/%-2.1/%0
 
 	LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %T %{Host}i" alternc
-        CustomLog /var/log/apache2/access.log alternc
+  CustomLog /var/log/apache2/access.log alternc
 </VirtualHost>
 
 <Directory /var/alternc>
@@ -32,12 +32,12 @@ Include /var/alternc/apache-vhost/vhosts_all.conf
 	php_admin_flag safe_mode_gid on
 	php_admin_flag safe_mode on
 	php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-        php_admin_value safe_mode_exec_dir /var/alternc/exec.usr
-        php_admin_value disable_functions chgrp,link,symlink
+  php_admin_value safe_mode_exec_dir /var/alternc/exec.usr
+  php_admin_value disable_functions chgrp,link,symlink
 
-        php_admin_flag enable_dl off
-        php_admin_value upload_tmp_dir /var/alternc/tmp
-        php_admin_value sendmail_path /usr/lib/alternc/sendmail
+  php_admin_flag enable_dl off
+  php_admin_value upload_tmp_dir /var/alternc/tmp
+  php_admin_value sendmail_path /usr/lib/alternc/sendmail
 </Directory>
 
 <Directory /usr/share/phpmyadmin>