diff --git a/Moonlight/App/Models/Forms/ServerRenameDataModel.cs b/Moonlight/App/Models/Forms/ServerRenameDataModel.cs
new file mode 100644
index 00000000..619ee328
--- /dev/null
+++ b/Moonlight/App/Models/Forms/ServerRenameDataModel.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Moonlight.App.Models.Forms;
+
+public class ServerRenameDataModel
+{
+    [Required(ErrorMessage = "You need to enter a name")]
+    [MaxLength(32, ErrorMessage = "The name cannot be longer that 32 characters")]
+    public string Name { get; set; }
+}
\ No newline at end of file
diff --git a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor
index 280936c6..ed01706a 100644
--- a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor
+++ b/Moonlight/Shared/Components/ServerControl/ServerSettings.razor
@@ -53,6 +53,8 @@
         if(Tags.Contains("pythonfile"))
             Settings.Add("Python file", typeof(PythonFileSetting));
         
+        Settings.Add("Server rename", typeof(ServerRenameSetting));
+        
         Settings.Add("Server reset", typeof(ServerResetSetting));
 
         return Task.CompletedTask;
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor
new file mode 100644
index 00000000..2c8185d4
--- /dev/null
+++ b/Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor
@@ -0,0 +1,41 @@
+@using Moonlight.App.Repositories.Servers
+@using Moonlight.App.Database.Entities
+@using Moonlight.App.Models.Forms
+
+@inject ServerRepository ServerRepository
+
+<div class="input-group mb-3">
+    <LazyLoader @ref="LazyLoader" Load="Load">
+        <SmartForm Model="Model" OnValidSubmit="Rename">
+            <div class="input-group mb-3">
+                <InputText @bind-Value="Model.Name" type="text" class="form-control"></InputText>
+                <button class="btn btn-primary" type="submit"><TL>Rename</TL></button>
+            </div>
+        </SmartForm>
+    </LazyLoader>
+</div>
+
+@code
+{
+    [CascadingParameter]
+    public Server CurrentServer { get; set; }
+
+    private ServerRenameDataModel Model = new();
+    private LazyLoader LazyLoader;
+
+    private Task Load(LazyLoader arg)
+    {
+        Model.Name = CurrentServer.Name;
+
+        return Task.CompletedTask;
+    }
+
+    private async Task Rename()
+    {
+        CurrentServer.Name = Model.Name;
+
+        ServerRepository.Update(CurrentServer);
+
+        await LazyLoader.Reload();
+    }
+}
\ No newline at end of file
diff --git a/Moonlight/Shared/Views/Servers/Create.razor b/Moonlight/Shared/Views/Servers/Create.razor
index 85ec9d91..90003403 100644
--- a/Moonlight/Shared/Views/Servers/Create.razor
+++ b/Moonlight/Shared/Views/Servers/Create.razor
@@ -179,7 +179,7 @@
                     .Where(x => x.Owner.Id == User.Id)
                     .Count(x => x.Image.Id == image.Id);
                 
-                if(serversCount < limit.Amount)
+                if(serversCount <= limit.Amount)
                     Images.Add(image, limit);
             }
         }
diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang
index 106c3ea6..047455cc 100644
--- a/Moonlight/resources/lang/de_de.lang
+++ b/Moonlight/resources/lang/de_de.lang
@@ -471,3 +471,6 @@ Default;Default
 You reached the maximum amount of servers for every image of your subscription;You reached the maximum amount of servers for every image of your subscription
 Personal information;Personal information
 Enter code;Enter code
+Server rename;Server rename
+Create code;Create code
+Save subscription;Save subscription