diff --git a/frontend/src/pages/Server.tsx b/frontend/src/pages/Server.tsx
index d33e1a0..54c3c26 100644
--- a/frontend/src/pages/Server.tsx
+++ b/frontend/src/pages/Server.tsx
@@ -187,12 +187,12 @@ export const Server = ({id, className}: Props) => {
                     <TabList className={'w-full'}>
                         <Tab variant="plain" indicatorInset color="neutral">Console</Tab>
                         <Tab variant="plain" indicatorInset color="neutral">General Settings</Tab>
-                        {/*<Tab variant="plain" indicatorInset color="neutral">Server Settings</Tab>*/}
+                        <Tab variant="plain" indicatorInset color="neutral">Server Settings</Tab>
                         <Tab variant="plain" indicatorInset color="neutral">Administration</Tab>
                     </TabList>
                     <Console serv={serv} setServ={setServ} serverStatus={serverStatus}/>
                     <General serv={serv} setServ={setServ}/>
-                    {/*<Settings setServ={setServ} serv={serv}></Settings>*/}
+                    <Settings setServ={setServ} serv={serv}></Settings>
                     <Administration serv={serv} setServ={setServ} onServerFilesDeleted={() => CheckServerInstalled(serv.id).then((val) => setIsInstalled(val)).catch((reason) => console.error(reason))}/>
                 </Tabs>) : (<InstallUpdater serv={serv} setServ={setServ} onInstalled={() => setIsInstalled(true)}/>)}
             </Card>
diff --git a/frontend/src/pages/server/Administration.tsx b/frontend/src/pages/server/Administration.tsx
index 1ea1c3e..d6f7223 100644
--- a/frontend/src/pages/server/Administration.tsx
+++ b/frontend/src/pages/server/Administration.tsx
@@ -47,7 +47,7 @@ export function Administration({setServ, serv, onServerFilesDeleted}: Props) {
 
 
     return (
-        <TabPanel value={2} className={'space-y-8'}>
+        <TabPanel value={3} className={'space-y-8'}>
             <Card variant="soft"  className={''}>
                 <Typography level="title-md">
                     Server Administration
diff --git a/frontend/src/pages/server/Settings.tsx b/frontend/src/pages/server/Settings.tsx
index f7492f4..f4e8a45 100644
--- a/frontend/src/pages/server/Settings.tsx
+++ b/frontend/src/pages/server/Settings.tsx
@@ -33,6 +33,11 @@ export function Settings({setServ, serv}: Props) {
                     <div className={'inline-block'}>
                         <FormLabel>Mods (e.g.: modid1,modid2,modid3)</FormLabel>
                         <Input className={"w-[60vw]"} value={serv?.mods} onChange={(e) => setServ((p) => ({ ...p, mods: e.target.value }))}></Input>
+                        <FormLabel>Player limit</FormLabel>
+                        <Input className={"w-3/12"} value={serv?.maxPlayers} type={"number"} onChange={(e) => {
+                            if (parseInt(e.target.value) > 0) {
+                                setServ((p) => ({...p, maxPlayers: parseInt(e.target.value)}))
+                            }}}></Input>
                     </div>
                 </div>
             </Card>