diff --git a/lgsm/config-default/config-lgsm/xntserver/_default.cfg b/lgsm/config-default/config-lgsm/xntserver/_default.cfg
index c12365273..494f51236 100644
--- a/lgsm/config-default/config-lgsm/xntserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/xntserver/_default.cfg
@@ -11,8 +11,7 @@
 ## Predefined Parameters | https://docs.linuxgsm.com/configuration/start-parameters
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-# List of game types and mutators: https://docs.linuxgsm.com/game-servers/unreal-tournament-3
-startparameters="-userdir ${serverfiles}/Xonotic/${selfname}"
+startparameters="-userdir ${systemdir}/${selfname}"
 
 #### LinuxGSM Settings ####
 
@@ -143,10 +142,10 @@ glibc="2.3.2"
 systemdir="${serverfiles}/Xonotic"
 executabledir="${systemdir}"
 executable="./xonotic-linux64-dedicated"
-servercfgdir="${systemdir}/${selfname}"
+servercfgdir="${systemdir}"
 servercfg="server.cfg"
-servercfgdefault="/server/server.cfg"
-servercfgfullpath="${servercfgdir}/${servercfg}"
+servercfgdefault="server/server.cfg"
+servercfgfullpath="${servercfgdir}/${selfname}/${servercfg}"
 
 ## Backup Directory
 backupdir="${lgsmdir}/backup"
diff --git a/lgsm/modules/fix_xnt.sh b/lgsm/modules/fix_xnt.sh
index 7a3126e31..218b99a66 100644
--- a/lgsm/modules/fix_xnt.sh
+++ b/lgsm/modules/fix_xnt.sh
@@ -8,6 +8,6 @@
 moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 # Create the directory if it doesn't exist
-if [ ! -d "${serverfiles}/Xonotic/${selfname}/data" ]; then
-	mkdir -p "${serverfiles}/Xonotic/${selfname}/data"
+if [ ! -d "${systemdir}/${selfname}/data" ]; then
+	mkdir -p "${systemdir}/${selfname}/data"
 fi