diff --git a/deploy.sh b/deploy.sh
index 834f425a54ebf47c63aa255fa9b7ac5d60fad338..32d404f65a61dc4653470b6944a0b9c1aef69964 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,7 +23,12 @@ done
 # remove local users
 for user in 01-mini 02-super 03-maxi direction prof
 do
-	sudo deluser --remove-home $user
+	sudo deluser $user
 done
 echo "looking for admin ldap user"
 sudo getent passwd admin
+echo "Fixing handy menu"
+for level in 01-mini 02-super 03-maxi
+do
+    sudo sed -i.bak s@/home/$level@~@g /usr/share/handymenu-${level/0[1-3]-/}/hm_utils.py
+done
diff --git a/dist/etc/security/pam_mount.conf.xml b/dist/etc/security/pam_mount.conf.xml
index cfa8581acc2f8ef7a0c7a82e93a31f69acb4339b..c4c7fb8950b4007ee90cff289271bbe6e88c8a9a 100644
--- a/dist/etc/security/pam_mount.conf.xml
+++ b/dist/etc/security/pam_mount.conf.xml
@@ -13,7 +13,14 @@
 <debug enable="0" />
 
 		<!-- Volume definitions -->
-		<volume user="*" fstype="cifs" server="192.168.234.6" path="%(DOMAIN_USER)" mountpoint="/home/%(DOMAIN_USER)" options="user,sec=ntlm,nodev,nosuid" />
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="%(DOMAIN_USER)" mountpoint="/home/%(DOMAIN_USER)" />
+
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="Profs" mountpoint="/home/Profs" options="gid=5002"/>
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="Eleves" mountpoint="/home/Eleves" />
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="Administratifs" mountpoint="/home/Administratifs" options="gid=5003" />
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="Ecole" mountpoint="/home/Ecole" />
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="Applis" mountpoint="/home/Applis" />
+		<volume user="*" fstype="cifs" server="192.168.234.6" path="IPC$" mountpoint="/home/IPC" />
 
 
 		<!-- pam_mount parameters: General tunables -->