diff --git a/scripts/upgrade b/scripts/upgrade
index 476ef6a..e6ffa01 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -112,6 +112,11 @@ 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
+
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================