diff --git a/data/helpers.d/multimedia b/data/helpers.d/multimedia
index 4ec7611fc..552b8c984 100644
--- a/data/helpers.d/multimedia
+++ b/data/helpers.d/multimedia
@@ -32,9 +32,9 @@ ynh_multimedia_build_main_dir() {
         ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
         # Création du lien symbolique dans le home de l'utilisateur.
         #link will only be created if the home directory of the user exists and if it's located in '/home' folder
-        home="$(getent passwd $user | cut -d: -f6)"
-        if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
-            ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
+        local user_home="$(getent passwd $user | cut -d: -f6 | grep '^/home/')"
+        if [[ -d "$user_home" ]]; then
+            ln -sfn "$MEDIA_DIRECTORY/$user" "$user_home/Multimedia"
         fi
         # Propriétaires des dossiers utilisateurs.
         chown -R $user "$MEDIA_DIRECTORY/$user"
diff --git a/data/hooks/post_user_create/ynh_multimedia b/data/hooks/post_user_create/ynh_multimedia
index 2fa02505a..2be3f42d4 100644
--- a/data/hooks/post_user_create/ynh_multimedia
+++ b/data/hooks/post_user_create/ynh_multimedia
@@ -16,9 +16,9 @@ mkdir -p "$MEDIA_DIRECTORY/$user/eBook"
 ln -sfn "$MEDIA_DIRECTORY/share" "$MEDIA_DIRECTORY/$user/Share"
 # Création du lien symbolique dans le home de l'utilisateur.
 #link will only be created if the home directory of the user exists and if it's located in '/home' folder
-home="$(getent passwd $user | cut -d: -f6)"
-if [[ -d "$home" && "$(echo "$home" | grep /home/)" ]]; then
-    ln -sfn "$MEDIA_DIRECTORY/$user" "$home/Multimedia"
+local user_home="$(getent passwd $user | cut -d: -f6 | grep '^/home/')"
+if [[ -d "$user_home" ]]; then
+    ln -sfn "$MEDIA_DIRECTORY/$user" "$user_home/Multimedia"
 fi
 # Propriétaires des dossiers utilisateurs.
 chown -R $user "$MEDIA_DIRECTORY/$user"