diff --git a/Python/etc/postfix/main.cf b/Python/etc/postfix/main.cf
index 6124cb5..dc8cf6b 100644
--- a/Python/etc/postfix/main.cf
+++ b/Python/etc/postfix/main.cf
@@ -66,8 +66,10 @@ myorigin = "crans.org"
 
 @# Reseaux locaux
 mynetworks = local_networks
-if mx:
+if mx and not users:
     add(client_networks + adm_networks)
+elif users:
+    add(adm_networks)
 elif tracker:
     add(adm_networks)
 
@@ -83,7 +85,7 @@ if mx:
     @# Destinations acceptees
     mydestination = [hostname, "$myhostname",
                      "localhost", "localhost.$mydomain"]
-    if main | users:
+    if main or users:
         add(["$mydomain",
              "crans.ens-cachan.fr",
              "clubs.ens-cachan.fr",
@@ -221,12 +223,6 @@ if main:
     @# (for example: after paypal.com registration you don't receive activation mail! I've tried it.)
     @#
     smtpd_helo_restrictions = "permit_mynetworks, reject_invalid_hostname"
-    @
-    @#
-    @# against to open relay:
-    @#
-    smtpd_recipient_restrictions = "permit_mynetworks, reject_unauth_destination"
-    @
      
 @## Limitation des messages envoyés par minute
 @# On n'ignore que les messages venant d'adresses "protégées"
diff --git a/Python/etc/postfix/master.cf b/Python/etc/postfix/master.cf
index f7a6d6d..817c1ad 100644
--- a/Python/etc/postfix/master.cf
+++ b/Python/etc/postfix/master.cf
@@ -164,35 +164,3 @@ if has("news"):
 
 @# only used by postfix-tls
 @tlsmgr    unix  -       -       n       300     1       tlsmgr
-
-if users:
-    @# Smtp pour la reception des mails venant des autres MX
-    @# a verifier que ca vient du vlan adm.
-    print adm + ":smtp inet	n	-	n	-	-	smtpd"
-    @    -o content_filter=
-    @    -o local_recipient_maps=
-    @    -o smtpd_helo_restrictions=
-    @    -o smtpd_client_restrictions=
-    @    -o smtpd_sender_restrictions=
-    @    -o smtpd_recipient_restrictions=permit_mynetworks,reject
-    @    -o mynetworks=10.231.136.0/24
-if main:
-    @# Smtp pour la recuperation en local des mails d'amavis
-    print loc + ":10025 inet n    -       n       -       -     smtpd"
-    @      -o content_filter=
-    @      -o smtpd_delay_reject=no
-    @      -o smtpd_client_restrictions=permit_mynetworks,reject
-    @      -o smtpd_helo_restrictions=
-    @      -o smtpd_sender_restrictions=
-    @      -o smtpd_recipient_restrictions=permit_mynetworks,reject
-    @      -o smtpd_data_restrictions=reject_unauth_pipelining
-    @      -o smtpd_end_of_data_restrictions=
-    @      -o smtpd_restriction_classes=
-    @      -o mynetworks=127.0.0.0/8
-    @      -o smtpd_error_sleep_time=0
-    @      -o smtpd_soft_error_limit=1001
-    @      -o smtpd_hard_error_limit=1000
-    @      -o smtpd_client_connection_count_limit=0
-    @      -o smtpd_client_connection_rate_limit=0
-    @      -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_milters
-    @      -o local_header_rewrite_clients=