diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index 818b4e91..d07ff6c2 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -349,7 +349,7 @@ class ServersController(metaclass=Singleton):
         return False
 
     def crash_detection(self, server_obj):
-        svr = self.get_server_obj(server_obj.server_id)
+        svr = self.get_server_instance_by_id(server_obj.server_id)
         # start or stop crash detection depending upon user preference
         # The below functions check to see if the server is running.
         # They only execute if it's running.
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 617bb4e3..14461739 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -1107,8 +1107,14 @@ class PanelHandler(BaseHandler):
                     "/panel/error?error=Unauthorized access: not a role editor"
                 )
                 return
-
-            page_data["servers_all"] = self.controller.servers.get_all_defined_servers()
+            if exec_user["superuser"]:
+                page_data[
+                    "servers_all"
+                ] = self.controller.servers.get_all_defined_servers()
+            else:
+                page_data[
+                    "servers_all"
+                ] = self.controller.servers.get_authorized_servers(exec_user["user_id"])
             page_data[
                 "permissions_all"
             ] = self.controller.server_perms.list_defined_permissions()
@@ -1120,7 +1126,14 @@ class PanelHandler(BaseHandler):
             page_data["new_role"] = False
             role_id = self.get_argument("id", None)
             page_data["role"] = self.controller.roles.get_role_with_servers(role_id)
-            page_data["servers_all"] = self.controller.servers.get_all_defined_servers()
+            if exec_user["superuser"]:
+                page_data[
+                    "servers_all"
+                ] = self.controller.servers.get_all_defined_servers()
+            else:
+                page_data[
+                    "servers_all"
+                ] = self.controller.servers.get_authorized_servers(exec_user["user_id"])
             page_data[
                 "permissions_all"
             ] = self.controller.server_perms.list_defined_permissions()