diff --git a/scripts/upgrade b/scripts/upgrade
index 40df97c..e6ffa01 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -110,6 +110,10 @@ fi
 # Move data directory
 if [ -e "/home/""$app" ] && [ ! -e $datadir ]; then
     mv "/home/""$app" "$datadir"
+fi
+
+# Ensuring the user has the right home dir
+if [ ~$app != "$datadir" ]; then
     usermod -d "$datadir" $app
 fi