diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh
index fa5eeaf..0714b00 100644
--- a/modules/conf_mail.sh
+++ b/modules/conf_mail.sh
@@ -6,7 +6,7 @@
 #  * MAINDOM: Default main domain name
 # ------------------------------------------------------------------------------
 
-export VER_conf_mail="0.0.2"
+export VER_conf_mail="0.0.3"
 
 conf_mail()
 {
@@ -22,7 +22,10 @@ conf_mail()
 
 precheck_conf_mail()
 {
-    : # Nothing to check
+    [[ -n $MAINDOM ]] && (
+        prnt E "Aucun domaine principal renseigné."
+        die 158
+    )
 }
 
 export -f conf_mail
diff --git a/modules/install_mkagent.sh b/modules/install_mkagent.sh
index b7c1772..39c8214 100644
--- a/modules/install_mkagent.sh
+++ b/modules/install_mkagent.sh
@@ -1,3 +1,10 @@
+# ------------------------------------------------------------------------------
+# Install check_mk agent using xinetd superserver
+# ------------------------------------------------------------------------------
+# Variable:
+#  * MK_SERVER: Server IP address
+#  * MK_PORT: Port check_mk agent will use to communicate with server
+# ------------------------------------------------------------------------------
 
 export VER_install_mkagent="0.0.1"
 
@@ -6,12 +13,16 @@ install_mkagent()
     pkginst $MYPATH/repo/mk_agents/check-mk-agent_${MKVERSION}_all.deb
     backupdist /etc/xinetd.d/check_mk
     installfile check_mk /etc/xinetd.d/check_mk
+    sed -i -e "s/@MK_SERVER@/$MK_SERVER/" /etc/xinetd.d/check_mk
     svc_restart xinetd
 }
 
 precheck_install_mkagent()
 {
-    : # rien à vérifier
+    [[ -n $MK_SERVER ]] && (
+        prnt E "Serveur check_mk non déclaré."
+        die 162
+    )
 }
 
 export -f install_mkagent
diff --git a/modules/install_pkg.sh b/modules/install_pkg.sh
index 0f85b0a..f70de4a 100644
--- a/modules/install_pkg.sh
+++ b/modules/install_pkg.sh
@@ -29,14 +29,14 @@ install_pkg()
         done
     fi
 
-    # Cleaning
-    prnt I "Suppression des paquets résiduels le cas échéant..."
-    pkgautorem
-
     # Install all the configured packages
     [[ -n $PKGSEL ]] &&
         prnt I "Installation de la sélection de paquets..." &&
         pkginst $PKGSEL
+
+    # Cleaning
+    prnt I "Suppression des paquets résiduels le cas échéant..."
+    pkgautorem
 }
 
 precheck_install_pkg()
diff --git a/modules/install_profile.sh b/modules/install_profile.sh
index bd35514..639a466 100644
--- a/modules/install_profile.sh
+++ b/modules/install_profile.sh
@@ -5,17 +5,27 @@ export VER_install_profile="0.0.1"
 install_profile()
 {
     installfile ansi_shadow.flf /usr/share/figlet/ansi_shadow.flf
+    
+    # Create a dir in home so /home/* is always interpreted correctly
+    mkdir -pv /home/dummy
     for usr in /root /home/*; do
 	backupdist $usr/{,.}profile $usr/.bashrc
 	installfile {{.,}profile,.bashrc} $usr/
     done
+    
+    # Remove dummy dir
+    rm -rf /home/dummy
+    
     backupdist /etc/motd
     installfile motd /etc/motd
 }
 
 precheck_install_profile()
 {
-    :
+    [[ -d /home/dummy ]] && (
+        prnt E "/home/dummy existe mais est réservé a un usage interne."
+        die 155
+    )
 }
 
 export -f install_profile