diff --git a/roles/lmn_fvs/files/lmn-dolphin.sh b/roles/lmn_fvs/files/lmn-dolphin.sh
index 7b5d3a3..489e9e7 100644
--- a/roles/lmn_fvs/files/lmn-dolphin.sh
+++ b/roles/lmn_fvs/files/lmn-dolphin.sh
@@ -1,3 +1,6 @@
 if [[ "$UID" -gt 10000 ]] && [[ ! -f ~/.local/share/user-places.xbel.lmn ]] ; then
     (sleep 30 ; lmn-patch-dolphin.sh) &
 fi
+if [[ "$UID" -gt 10000 ]] && [[ -f ~/.local/share/user-places.xbel ]] ; then
+    lmn-fixhome-dolphin.sh
+fi
diff --git a/roles/lmn_fvs/files/lmn-fixhome-dolphin.sh b/roles/lmn_fvs/files/lmn-fixhome-dolphin.sh
new file mode 100644
index 0000000..017f949
--- /dev/null
+++ b/roles/lmn_fvs/files/lmn-fixhome-dolphin.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+
+set -eu
+
+file="${1:-$HOME/.local/share/user-places.xbel}"
+
+[[ -e "$file" ]] || exit 0
+
+if id | grep -q teachers; then 
+  exit 0
+fi
+
+NETHOME=(/srv/samba/schools/default-school/students/*/"$USER")
+[[ -d $NETHOME ]] || exit 0
+
+if FOUND=$(grep -o "/srv/samba/schools/default-school/students/.*/$USER" $file); then
+  if [[ "$NETHOME" != "$FOUND" ]] ; then
+    sed -i "s|/srv/samba/schools/default-school/students/.*/$USER|$NETHOME|g" $file
+  fi
+fi
diff --git a/roles/lmn_fvs/files/lmn-patch-dolphin.sh b/roles/lmn_fvs/files/lmn-patch-dolphin.sh
index ab27004..60707c8 100755
--- a/roles/lmn_fvs/files/lmn-patch-dolphin.sh
+++ b/roles/lmn_fvs/files/lmn-patch-dolphin.sh
@@ -16,11 +16,12 @@ fi
 id="$(grep ID "$file" | sed -E "s|^.+ID>([[:digit:]]+)/([[:digit:]]+)</ID.+$|\1:\2|" \
 	    | sort -n -t: -k2 | tail -1 )"
 
-if id | grep teachers; then
+if id | grep -q teachers; then
   NETHOME=/srv/samba/schools/default-school/teachers/$USER
 else
-  NETHOME=/srv/samba/schools/default-school/students/*/$USER
+  NETHOME=(/srv/samba/schools/default-school/students/*/"$USER")
 fi
+[[ -d $NETHOME ]] || exit 0
 
 IDENTITY="${id%%:*}"
 NUM0="${id##*:}"
diff --git a/roles/lmn_fvs/tasks/main.yml b/roles/lmn_fvs/tasks/main.yml
index d42f560..4edb390 100644
--- a/roles/lmn_fvs/tasks/main.yml
+++ b/roles/lmn_fvs/tasks/main.yml
@@ -184,6 +184,7 @@
   loop:
     - lmn-reset-dolphin.sh
     - lmn-patch-dolphin.sh
+    - lmn-fixhome-dolphin.sh
 
 - name: Configure KDE dolphin menu
   ansible.builtin.copy: