diff --git a/entrypoint-user.sh b/entrypoint-user.sh
index 7c88029..e389c68 100755
--- a/entrypoint-user.sh
+++ b/entrypoint-user.sh
@@ -30,6 +30,15 @@ elif [ -d "/app/lgsm/modules" ]; then
   chmod +x /app/lgsm/modules/*
 fi
 
+# If a command was passed in, run it and exit
+if [ "$1" != "" ]; then
+    echo -e ""
+    echo -e "Running ${GAMESERVER}"
+    echo -e "================================="
+    ./"${GAMESERVER}" "$1"
+    exit 0
+fi
+
 # Install game server
 if [ -z "$(ls -A -- "/data/serverfiles" 2> /dev/null)" ]; then
   echo -e ""
diff --git a/entrypoint.sh b/entrypoint.sh
index 38462b0..7145b51 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -63,5 +63,5 @@ export HOME=/data
 echo -e ""
 echo -e "Switch to user ${USER}"
 echo -e "================================="
-exec gosu "${USER}" /app/entrypoint-user.sh &
+exec gosu "${USER}" /app/entrypoint-user.sh "$@" &
 wait