diff --git a/admin.php b/admin.php
index 72fa90f..12d1299 100644
--- a/admin.php
+++ b/admin.php
@@ -220,7 +220,7 @@ if ($Action == "files") {
         $html .= "\t\t\t\t\t\t<td class=\"adminKeyType\">$keyType</td>\n";
 
         if ($Primary == 1 && $line['primaryadmin'] != 1) { // primary admins cannot be removed
-            $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID\">Remove</a></td>\n";
+            $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID&type=2\">Remove</a></td>\n";
         }
 
         $html .= "\t\t\t\t\t</tr>\n";
@@ -254,7 +254,7 @@ if ($Action == "files") {
         $html .= "\t\t\t\t\t\t<td class=\"adminIP\">$IP</td>\n";
         $html .= "\t\t\t\t\t\t<td class=\"adminUserAgent\">$UserAgent</td>\n";
         $html .= "\t\t\t\t\t\t<td class=\"adminKeyType\">$keyType</td>\n";
-        $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID\">Remove</a></td>\n";
+        $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID&type=0\">Remove</a></td>\n";
         $html .= "\t\t\t\t\t</tr>\n";
     }
 
@@ -286,7 +286,7 @@ if ($Action == "files") {
         $html .= "\t\t\t\t\t\t<td class=\"adminIP\">$IP</td>\n";
         $html .= "\t\t\t\t\t\t<td class=\"adminUserAgent\">$UserAgent</td>\n";
         $html .= "\t\t\t\t\t\t<td class=\"adminKeyType\">$keyType</td>\n";
-        $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID\">Remove</a></td>\n";
+        $html .= "\t\t\t\t\t\t<td class=\"adminRemove\"><a href=\"/remove-key.php?redir=admin&id=$ID&type=1\">Remove</a></td>\n";
         $html .= "\t\t\t\t\t</tr>\n";
     }
 
diff --git a/remove-key.php b/remove-key.php
index a36b70e..0e26dd3 100644
--- a/remove-key.php
+++ b/remove-key.php
@@ -15,6 +15,14 @@ if (!isset($_COOKIE[$cookieName]) || !isset($_COOKIE[$cookieTypeName])) {
     die();
 }
 
+$AdminIsPrimary = 0;
+$KeyIsPrimary = 0;
+$AuthorizedRemoval = 0;
+$Removed = 0;
+$Redirect = "";
+$id = 0;
+$type = 0;
+
 if (isset($_REQUEST['id'])) {
     $id = $_REQUEST['id'];
 } else {
@@ -22,11 +30,12 @@ if (isset($_REQUEST['id'])) {
     die();
 }
 
-$AdminIsPrimary = 0;
-$KeyIsPrimary = 0;
-$AuthorizedRemoval = 0;
-$Removed = 0;
-$Redirect = "";
+if (isset($_REQUEST['type'])) {
+    $type = $_REQUEST['type'];
+} else {
+    print "No type specified, is not safe to delete.";
+    die();
+}
 
 if (isset($_REQUEST['redir'])) {
     $Redirect = $_REQUEST['redir'];
@@ -51,6 +60,7 @@ if ($AuthorizedRemoval != 1) {
 
 $DatabaseQuery = $Database->query('SELECT * FROM keys');
 while ($line = $DatabaseQuery->fetchArray()) {
+    if ($type != 0) break;
     if ($line['id'] == $id && $line['id'] != "" && $id != "") { // passed ID is a key that exists
         if ($AuthorizedRemoval == 1) {
             $Database->exec("DELETE FROM keys WHERE id='$id'");
@@ -66,6 +76,7 @@ while ($line = $DatabaseQuery->fetchArray()) {
 
 $DatabaseQuery = $Database->query('SELECT * FROM tkeys');
 while ($line = $DatabaseQuery->fetchArray()) {
+    if ($type != 1) break;
     if ($line['id'] == $id && $line['id'] != "" && $id != "" && $Removed != 1) { // passed ID is a key that exists
         if ($AuthorizedRemoval == 1) {
             $Database->exec("DELETE FROM tkeys WHERE id='$id'");
@@ -81,6 +92,7 @@ while ($line = $DatabaseQuery->fetchArray()) {
 
 $DatabaseQuery = $Database->query('SELECT * FROM admins');
 while ($line = $DatabaseQuery->fetchArray()) {
+    if ($type != 2) break;
     if ($line['id'] == $id && $line['id'] != "" && $id != "" && $Removed != 1 && $line['primaryadmin'] != 1) { // passed ID is a key that exists
         if ($AuthorizedRemoval == 1 && $AdminIsPrimary == 1) { // in order to delete an admin key you must be a primary admin
             $Database->exec("DELETE FROM admins WHERE id='$id'");