diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php
index b0b93373..620feea1 100644
--- a/app/Classes/Pterodactyl.php
+++ b/app/Classes/Pterodactyl.php
@@ -363,8 +363,8 @@ class Pterodactyl
             throw self::getException($e->getMessage());
         }
         $node = $response['attributes'];
-        $freeMemory = $node['memory'] - $node['allocated_resources']['memory'];
-        $freeDisk = $node['disk'] - $node['allocated_resources']['disk'];
+        $freeMemory = ($node['memory']*($node['memory_overallocate']+100)/100) - $node['allocated_resources']['memory'];
+        $freeDisk = ($node['disk']*($node['disk_overallocate']+100)/100) - $node['allocated_resources']['disk'];
         if ($freeMemory < $requireMemory) {
             return false;
           }
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index cf731ddf..20deffca 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -45,6 +45,13 @@ class ServerController extends Controller
 
             $server->node = $serverRelationships['node']['attributes']['name'];
 
+            //Check if a server got renamed on Pterodactyl
+            $savedServer = Server::query()->where('id', $server->id)->first();
+            if($savedServer->name != $serverAttributes['name']){
+                $savedServer->name = $serverAttributes['name'];
+                $server->name = $serverAttributes['name'];
+                $savedServer->save();
+            }
             //get productname by product_id for server
             $product = Product::find($server->product_id);