diff --git a/app/Http/Controllers/Moons/MoonsAdminController.php b/app/Http/Controllers/Moons/MoonsAdminController.php
index a5e0ec6f4..6b1510fb7 100644
--- a/app/Http/Controllers/Moons/MoonsAdminController.php
+++ b/app/Http/Controllers/Moons/MoonsAdminController.php
@@ -56,6 +56,11 @@ class MoonsAdminController extends Controller
             'contact' => 'required',
         ]);
 
+        if($request->removal == true) {
+            $this->RemoveRenter($request->system, $request->planet, $request->moon);
+            return redirect('/moons/admin/updatemoon')->with('success', 'Moon Updated and Renter Removed.');
+        }
+
         //Take the  contact name and create a character_id from it
         if($request->contact == 'None') {
             $contact = 'None';
@@ -82,22 +87,7 @@ class MoonsAdminController extends Controller
             'Contact' => $contact,
         ])->first();
 
-        if($found && $request->removal == true) {
-            MoonRental::where([
-                'System' => $request->system,
-                'Planet' => $request->planet,
-                'Moon' => $request->moon,
-            ])->delete();
-
-            MoonRental::insert([
-                'System' => $request->system,
-                'Planet' => $request->planet,
-                'Moon' => $request->moon,
-                'Contact' => 'None',
-                'Paid' => 'No',
-                'Paid_Until' => Carbon::now()->endOfMonth(),
-            ]);
-        } else if($found && $request->removal != true) {
+        if($found && $request->removal != true) {
             if($allianceId = 99004116) {
                 MoonRental::where([
                     'System' => $request->system,
@@ -431,4 +421,39 @@ class MoonsAdminController extends Controller
 
         return redirect('/dashboard')->with('success', 'Moon Added');
     }
+
+    private function RemoveRenter($system, $planet, $moon) {
+        $found = MoonRental::where([
+            'System' => $request->system,
+            'Planet' => $request->planet,
+            'Moon' => $request->moon,
+            'Contact' => $contact,
+        ])->first();
+
+        if($found) {
+            MoonRental::where([
+                'System' => $request->system,
+                'Planet' => $request->planet,
+                'Moon' => $request->moon,
+            ])->delete();
+
+            MoonRental::insert([
+                'System' => $request->system,
+                'Planet' => $request->planet,
+                'Moon' => $request->moon,
+                'Contact' => 'None',
+                'Paid' => 'No',
+                'Paid_Until' => Carbon::now()->endOfMonth(),
+            ]);
+        } else {
+            MoonRental::insert([
+                'System' => $request->system,
+                'Planet' => $request->planet,
+                'Moon' => $request->moon,
+                'Contact' => 'None',
+                'Paid' => 'No',
+                'Paid_Until' => Carbon::now()->endOfMonth(),
+            ]);
+        }
+    }
 }