diff --git a/functions/fn_serverconfig b/functions/fn_serverconfig
index 0e8d46150..5d79f4c21 100644
--- a/functions/fn_serverconfig
+++ b/functions/fn_serverconfig
@@ -27,7 +27,12 @@ echo ""
 echo "Configuring ${gamename} Server"
 echo "================================="
 sleep 1
-read -p "Enter server name: " servername
-read -p "Enter rcon password: " rconpass
+if [ -z ${autoinstall} ]; then
+	read -p "Enter server name: " servername
+	read -p "Enter rcon password: " rconpass
+else
+	servername="${servicename}"
+	rconpass="${rconpass}"
+fi
 sed -i "s/\"hostname\"/\"${servername}\"/g" ${servercfgfullpath}
 sed -i "s/\"rconpassword\"/\"${rconpass}\"/g" ${servercfgfullpath}
\ No newline at end of file