diff --git a/app/classes/controllers/roles_controller.py b/app/classes/controllers/roles_controller.py
index 5e7925a3..d29a429d 100644
--- a/app/classes/controllers/roles_controller.py
+++ b/app/classes/controllers/roles_controller.py
@@ -64,8 +64,12 @@ class RolesController:
             HelperRoles.update_role(role_id, up_data)
 
     @staticmethod
-    def add_role(role_name):
-        return HelperRoles.add_role(role_name)
+    def add_role(role_name, manager):
+        return HelperRoles.add_role(role_name, manager)
+
+    @staticmethod
+    def get_managed_roles(exec_user_id):
+        return HelperRoles.get_managed_roles(exec_user_id)
 
     class RoleServerJsonType(t.TypedDict):
         server_id: t.Union[str, int]
diff --git a/app/classes/models/roles.py b/app/classes/models/roles.py
index 4d61e051..7c9b98b1 100644
--- a/app/classes/models/roles.py
+++ b/app/classes/models/roles.py
@@ -6,6 +6,7 @@ from peewee import (
     DoesNotExist,
     AutoField,
     DateTimeField,
+    IntegerField,
 )
 from playhouse.shortcuts import model_to_dict
 
@@ -22,6 +23,7 @@ class Roles(BaseModel):
     created = DateTimeField(default=datetime.datetime.now)
     last_update = DateTimeField(default=datetime.datetime.now)
     role_name = CharField(default="", unique=True, index=True)
+    manager = IntegerField(null=True)
 
     class Meta:
         table_name = "roles"
@@ -38,6 +40,10 @@ class HelperRoles:
     def get_all_roles():
         return Roles.select()
 
+    @staticmethod
+    def get_managed_roles(exec_user_id):
+        return Roles.select().where(Roles.manager == exec_user_id)
+
     @staticmethod
     def get_all_role_ids() -> t.List[int]:
         return [role.role_id for role in Roles.select(Roles.role_id).execute()]
@@ -71,11 +77,12 @@ class HelperRoles:
         )
 
     @staticmethod
-    def add_role(role_name):
+    def add_role(role_name, manager):
         role_id = Roles.insert(
             {
                 Roles.role_name: role_name.lower(),
                 Roles.created: Helpers.get_time_as_string(),
+                Roles.manager: manager,
             }
         ).execute()
         return role_id
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index da5bd7b9..803be805 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -865,6 +865,13 @@ class PanelHandler(BaseHandler):
                 page_data["managed_users"] = self.controller.users.get_managed_users(
                     exec_user["user_id"]
                 )
+                page_data["assigned_roles"] = []
+                for item in page_data["roles"]:
+                    page_data["assigned_roles"].append(item.role_id)
+
+                page_data["managed_roles"] = self.controller.roles.get_managed_roles(
+                    exec_user["user_id"]
+                )
 
             template = "panel/panel_config.html"
 
@@ -1245,6 +1252,11 @@ class PanelHandler(BaseHandler):
                 defined_servers = self.controller.servers.get_authorized_servers(
                     exec_user["user_id"]
                 )
+
+            page_data["role_manager"] = {
+                "user_id": -100,
+                "username": "None",
+            }
             page_servers = []
             for server in defined_servers:
                 if server not in page_servers:
@@ -1285,6 +1297,16 @@ class PanelHandler(BaseHandler):
             page_data["user-roles"] = user_roles
             page_data["users"] = self.controller.users.get_all_users()
 
+            if page_data["role"]["manager"] is not None:
+                page_data["role_manager"] = self.controller.users.get_user_by_id(
+                    page_data["role"]["manager"]
+                )
+            else:
+                page_data["role_manager"] = {
+                    "user_id": -100,
+                    "username": "None",
+                }
+
             if EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_crafty_permissions:
                 self.redirect(
                     "/panel/error?error=Unauthorized access: not a role editor"
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index df4ba684..b49b6410 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -283,7 +283,8 @@ class ServerHandler(BaseHandler):
                             new_server_id
                         ).get("server_uuid")
                         role_id = self.controller.roles.add_role(
-                            f"Creator of Server with uuid={new_server_uuid}"
+                            f"Creator of Server with uuid={new_server_uuid}",
+                            exec_user["user_id"],
                         )
                         self.controller.server_perms.add_role_server(
                             new_server_id, role_id, "11111111"
@@ -420,7 +421,8 @@ class ServerHandler(BaseHandler):
                         new_server_id
                     ).get("server_uuid")
                     role_id = self.controller.roles.add_role(
-                        f"Creator of Server with uuid={new_server_uuid}"
+                        f"Creator of Server with uuid={new_server_uuid}",
+                        exec_user["user_id"],
                     )
                     self.controller.server_perms.add_role_server(
                         new_server_id, role_id, "11111111"
@@ -545,7 +547,8 @@ class ServerHandler(BaseHandler):
                         new_server_id
                     ).get("server_uuid")
                     role_id = self.controller.roles.add_role(
-                        f"Creator of Server with uuid={new_server_uuid}"
+                        f"Creator of Server with uuid={new_server_uuid}",
+                        exec_user["user_id"],
                     )
                     self.controller.server_perms.add_role_server(
                         new_server_id, role_id, "11111111"
diff --git a/app/frontend/templates/panel/panel_config.html b/app/frontend/templates/panel/panel_config.html
index 0c89a596..d5efeac6 100644
--- a/app/frontend/templates/panel/panel_config.html
+++ b/app/frontend/templates/panel/panel_config.html
@@ -177,7 +177,32 @@
                           <td><a href="/panel/edit_role?id={{role.role_id}}"><i class="fas fa-pencil-alt"></i></a></td>
                         </tr>
                         {% end %}
-
+                        {% for role in data['managed_roles'] %}
+                        {% if role.role_id not in data['assigned_roles'] %}
+                        <tr>
+                          <td>{{ role.role_name }}</td>
+                          <td id="role_list_{{role.role_id}}">
+                            <ul id="{{role.role_id}}">
+                              {% for item in data['role-servers'][role.role_id] %}
+                              <li>{{item}}</li>
+                              {% end %}
+                            </ul>
+                          </td>
+                          <td>
+                            <ul>
+                              {% for user in data['users'] %}
+                              {% for ruser in data['user-roles'][user.user_id] %}
+                              {% if ruser == role.role_name %}
+                              <li>{{ user.username }}</li>
+                              {% end %}
+                              {% end %}
+                              {% end %}
+                            </ul>
+                          </td>
+                          <td><a href="/panel/edit_role?id={{role.role_id}}"><i class="fas fa-pencil-alt"></i></a></td>
+                        </tr>
+                        {& end %}
+                        {% end %}
                       </tbody>
                     </table>
                   </div>
diff --git a/app/frontend/templates/panel/panel_edit_role.html b/app/frontend/templates/panel/panel_edit_role.html
index 49559591..fd29d0d4 100644
--- a/app/frontend/templates/panel/panel_edit_role.html
+++ b/app/frontend/templates/panel/panel_edit_role.html
@@ -9,22 +9,22 @@
 
 <div class="content-wrapper">
 
-    <!-- Page Title Header Starts-->
+  <!-- Page Title Header Starts-->
   <div class="row page-title-header">
     <div class="col-12">
       <div class="page-header">
         {% if data['new_role'] %}
-          <h4 class="page-title">
-            {{ translate('rolesConfig', 'pageTitleNew', data['lang']) }}
-              <br />
-              <small>RID: N/A</small>
-          </h4>
+        <h4 class="page-title">
+          {{ translate('rolesConfig', 'pageTitleNew', data['lang']) }}
+          <br />
+          <small>RID: N/A</small>
+        </h4>
         {% else %}
-          <h4 class="page-title">
-            {{ translate('rolesConfig', 'pageTitle', data['lang']) }} - {{ data['role']['role_name'] }}
-              <br />
-              <small>RID: {{ data['role']['role_id'] }}</small>
-          </h4>
+        <h4 class="page-title">
+          {{ translate('rolesConfig', 'pageTitle', data['lang']) }} - {{ data['role']['role_name'] }}
+          <br />
+          <small>RID: {{ data['role']['role_id'] }}</small>
+        </h4>
         {% end %}
       </div>
     </div>
@@ -39,7 +39,8 @@
         <div class="card-body  pt-0">
           <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
             <li class="nav-item">
-              <a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config" role="tab" aria-selected="true">
+              <a class="nav-link active" href="/panel/edit_role?id={{ data['role']['role_id'] }}&subpage=config"
+                role="tab" aria-selected="true">
                 <i class="fas fa-cogs"></i>{{ translate('rolesConfig', 'config', data['lang']) }}</a>
             </li>
             <!-- <li class="nav-item">
@@ -49,26 +50,33 @@
           </ul>
           <div class="">
             <div class="">
-              <form class="forms-sample" method="post" action="{{ '/panel/add_role' if data['new_role'] else '/panel/edit_role' }}">
+              <form class="forms-sample" method="post"
+                action="{{ '/panel/add_role' if data['new_role'] else '/panel/edit_role' }}">
                 {% raw xsrf_form_html() %}
                 <input type="hidden" name="id" value="{{ data['role']['role_id'] }}">
                 <input type="hidden" name="subpage" value="config">
 
                 <div class="card">
                   <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                    <h4 class="card-title"><i class="fas fa-user-tag"></i> {{ translate('rolesConfig', 'roleTitle', data['lang']) }}</h4>
+                    <h4 class="card-title"><i class="fas fa-user-tag"></i> {{ translate('rolesConfig', 'roleTitle',
+                      data['lang']) }}</h4>
                   </div>
                   <div class="card-body">
                     <div class="form-group">
-                      <label for="role_name">{{ translate('rolesConfig', 'roleName', data['lang']) }} <small class="text-muted ml-1"> - {{ translate('rolesConfig', 'roleDesc', data['lang']) }}</small> </label>
-                      <input type="text" class="form-control" name="role_name" id="role_name" value="{{ data['role']['role_name']  }}" placeholder="Role Name" >
+                      <label for="role_name">{{ translate('rolesConfig', 'roleName', data['lang']) }} <small
+                          class="text-muted ml-1"> - {{ translate('rolesConfig', 'roleDesc', data['lang']) }}</small>
+                      </label>
+                      <input type="text" class="form-control" name="role_name" id="role_name"
+                        value="{{ data['role']['role_name']  }}" placeholder="Role Name">
                     </div>
                   </div>
                 </div>
 
                 <div class="card">
                   <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                    <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('rolesConfig', 'roleServers', data['lang']) }}  <small class="text-muted ml-1"> {{ translate('rolesConfig', 'serversDesc', data['lang']) }}</small> </h4>
+                    <h4 class="card-title"><i class="fas fa-server"></i> {{ translate('rolesConfig', 'roleServers',
+                      data['lang']) }} <small class="text-muted ml-1"> {{ translate('rolesConfig', 'serversDesc',
+                        data['lang']) }}</small> </h4>
                   </div>
                   <div class="card-body">
                     <div class="form-group">
@@ -86,13 +94,14 @@
                                 --table-border-width: 1px;
                                 border-collapse: collapse;
                               }
+
                               th.rotate-column-header {
                                 /* Something you can count on */
                                 height: 140px;
                                 white-space: nowrap;
                               }
 
-                              th.rotate-column-header > div {
+                              th.rotate-column-header>div {
                                 transform:
                                   /* Magic Numbers */
                                   translate(0px, 51px)
@@ -100,15 +109,18 @@
                                   rotate(315deg);
                                 width: 30px;
                               }
-                              th.rotate-column-header > div > span {
+
+                              th.rotate-column-header>div>span {
                                 border-bottom: 1px solid #ccc;
                                 padding: 5px 10px;
                               }
+
                               th.rotate {
                                 white-space: nowrap;
                                 position: relative;
                               }
-                              th.rotate > div {
+
+                              th.rotate>div {
                                 /* place div at bottom left of the th parent */
                                 position: absolute;
                                 bottom: 0;
@@ -118,13 +130,13 @@
                                 /* Move the top left corner of the span's bottom-border to line up with the top left corner of the td's border-right border so that the border corners are matched
                                   * Rotate 315 (-45) degrees about matched border corners */
                                 transform:
-                                  translate(calc(100% - var(--table-border-width) / 2), var(--table-border-width))
-                                  rotate(-45deg);
+                                  translate(calc(100% - var(--table-border-width) / 2), var(--table-border-width)) rotate(-45deg);
                                 transform-origin: 0% calc(100% - var(--table-border-width));
                                 transition: transform 500ms;
                                 width: 100%;
                               }
-                              th.rotate > div > span {
+
+                              th.rotate>div>span {
                                 /* make sure the bottom of the span is matched up with the bottom of the parent div */
                                 position: absolute;
                                 bottom: 0;
@@ -134,7 +146,8 @@
                                 padding-bottom: 5px;
                                 user-select: none;
                               }
-                              table.rotate-table > tbody td {
+
+                              table.rotate-table>tbody td {
                                 border-right: var(--table-border-width) solid #383e5d;
                                 /* make sure this is at least as wide as sqrt(2) * height of the tallest letter in your font or the headers will overlap each other*/
                                 min-width: 30px;
@@ -144,53 +157,57 @@
                               }
 
                               @media screen and (min-width: 1650px) {
-                                th.rotate > div {
+                                th.rotate>div {
                                   transform: translate(15px, 0px) rotate(0deg);
                                 }
-                                th.rotate > div > span {
+
+                                th.rotate>div>span {
                                   border-bottom-color: transparent;
                                 }
                               }
                             </style>
                             <tr class="rounded">
                               <th>{{ translate('rolesConfig', 'serverName', data['lang']) }}</th>
-                              <th class="rotate"><div><span>{{ translate('rolesConfig', 'serverAccess', data['lang']) }}</span></div></th>
+                              <th class="rotate">
+                                <div><span>{{ translate('rolesConfig', 'serverAccess', data['lang']) }}</span></div>
+                              </th>
                               {% for permission in data['permissions_all'] %}
-                                <th class="rotate"><div><span>{{ permission.name }}</span></div></th>
+                              <th class="rotate">
+                                <div><span>{{ permission.name }}</span></div>
+                              </th>
                               {% end %}
                             </tr>
                           </thead>
                           <tbody>
-                          {% for server in data['servers_all'] %}
+                            {% for server in data['servers_all'] %}
                             <tr>
                               <td>{{ server['server_name'] }}</td>
                               <td>
-                                <input type="checkbox" class="" onclick="enable_disable(event)" data-id="{{server['server_id']}}"
-                                id="server_{{ server['server_id'] }}_access"
-                                name="server_{{ server['server_id'] }}_access"
-                                {{ 'checked' if server['server_id'] in data['role']['servers'] else '' }}
-                                autocomplete="off" value="1">
+                                <input type="checkbox" class="" onclick="enable_disable(event)"
+                                  data-id="{{server['server_id']}}" id="server_{{ server['server_id'] }}_access"
+                                  name="server_{{ server['server_id'] }}_access" {{ 'checked' if server['server_id'] in
+                                  data['role']['servers'] else '' }} autocomplete="off" value="1">
                               </td>
                               {% for permission in data['permissions_all'] %}
                               {% if server['server_id'] in data['role']['servers'] %}
-                                <td>
-                                  <input type="checkbox" class="{{server['server_id']}}_perms"
+                              <td>
+                                <input type="checkbox" class="{{server['server_id']}}_perms"
                                   id="permission_{{ server['server_id'] }}_{{ permission.name }}"
-                                  name="permission_{{ server['server_id'] }}_{{ permission.name }}"
-                                  {{ 'checked' if permission in data['permissions_dict'].get(server['server_id'], []) else '' }}
+                                  name="permission_{{ server['server_id'] }}_{{ permission.name }}" {{ 'checked' if
+                                  permission in data['permissions_dict'].get(server['server_id'], []) else '' }}
                                   autocomplete="off" value="1">
-                                </td>
+                              </td>
                               {% else %}
                               <td>
                                 <input type="checkbox" class="{{server['server_id']}}_perms"
-                                id="permission_{{ server['server_id'] }}_{{ permission.name }}"
-                                name="permission_{{ server['server_id'] }}_{{ permission.name }}"
-                                autocomplete="off" value="1" disabled>
+                                  id="permission_{{ server['server_id'] }}_{{ permission.name }}"
+                                  name="permission_{{ server['server_id'] }}_{{ permission.name }}" autocomplete="off"
+                                  value="1" disabled>
                               </td>
                               {% end %}
                               {% end %}
                             </tr>
-                          {% end %}
+                            {% end %}
 
                           </tbody>
                         </table>
@@ -201,18 +218,22 @@
 
                 <div class="card">
                   <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                    <h4 class="card-title"><i class="fas fa-settings"></i> {{ translate('panelConfig', 'save', data['lang']) }}</h4>
+                    <h4 class="card-title"><i class="fas fa-settings"></i> {{ translate('panelConfig', 'save',
+                      data['lang']) }}</h4>
                   </div>
                   <div class="card-body">
-                    <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{ translate('panelConfig', 'save', data['lang']) }}</button>
-                    <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}</button>
+                    <button type="submit" class="btn btn-success mr-2"><i class="fas fa-save"></i> {{
+                      translate('panelConfig', 'save', data['lang']) }}</button>
+                    <button type="reset" onclick="location.href='/panel/panel_config'" class="btn btn-light"><i
+                        class="fas fa-undo-alt"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}</button>
                   </div>
                 </div>
               </form>
 
               <div class="card">
                 <div class="card-header header-sm d-flex justify-content-between align-items-center">
-                  <h4 class="card-title"><i class="fas fa-users"></i> {{ translate('rolesConfig', 'roleUsers', data['lang']) }}</h4>
+                  <h4 class="card-title"><i class="fas fa-users"></i> {{ translate('rolesConfig', 'roleUsers',
+                    data['lang']) }}</h4>
                 </div>
                 <div class="card-body">
                   <div class="table-responsive">
@@ -224,18 +245,18 @@
                         </tr>
                       </thead>
                       <tbody>
-                      {% for user in data['users'] %}
+                        {% for user in data['users'] %}
                         {% for ruser in data['user-roles'][user.user_id] %}
-                          {% if ruser == data['role']['role_name'] %}
-                            <tr>
-                              <td>{{ user.username }}</td>
-                              <td>
-                                <a href="/panel/edit_user?id={{user.user_id}}"><i class="fas fa-user-edit"></i></a>
-                              </td>
-                            </tr>
-                          {% end %}
+                        {% if ruser == data['role']['role_name'] %}
+                        <tr>
+                          <td>{{ user.username }}</td>
+                          <td>
+                            <a href="/panel/edit_user?id={{user.user_id}}"><i class="fas fa-user-edit"></i></a>
+                          </td>
+                        </tr>
+                        {% end %}
+                        {% end %}
                         {% end %}
-                      {% end %}
                       </tbody>
                     </table>
                   </div>
@@ -249,18 +270,24 @@
                   <blockquote class="blockquote">
                     <p class="mb-0">
                       {{ translate('rolesConfig', 'created', data['lang']) }} {{ str(data['role']['created']) }}
-                        <br />
-                        {{ translate('rolesConfig', 'configUpdate', data['lang']) }} {{ str(data['role']['last_update']) }}
-                        <br />
+                      <br />
+                      {{ translate('rolesConfig', 'configUpdate', data['lang']) }} {{ str(data['role']['last_update'])
+                      }}
+                      <br />
+                      Manager: {{ data['role_manager']['username'] }}
+                      <br />
                     </p>
                   </blockquote>
                   <div class="text-center">
                     {% if data['new_role'] %}
-                      <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a><br />
-                      <small>{{ translate('rolesConfig', 'doesNotExist', data['lang']) }}</small>
+                    <a class="btn btn-sm btn-danger disabled"><i class="fas fa-trash"></i>{{ translate('rolesConfig',
+                      'delRole', data['lang']) }}</a><br />
+                    <small>{{ translate('rolesConfig', 'doesNotExist', data['lang']) }}</small>
                     {% else %}
-                      <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a>
+                    <a href="/panel/remove_role?id={{ data['role']['role_id'] }}" class="btn btn-sm btn-danger"><i
+                        class="fas fa-trash"></i>{{ translate('rolesConfig', 'delRole', data['lang']) }}</a>
                     {% end %}
+                  </div>
                 </div>
               </div>
             </div>
@@ -269,38 +296,37 @@
       </div>
     </div>
   </div>
-</div>
-<!-- content-wrapper ends -->
+  <!-- content-wrapper ends -->
 
-{% end %}
+  {% end %}
 
-{% block js %}
-<script>
+  {% block js %}
+  <script>
 
-  function enable_disable(event) {
+    function enable_disable(event) {
       let server_id = event.target.getAttribute('data-id');
       console.log(server_id);
       if (document.getElementById("server_" + server_id + "_access").checked) {
-        $('.'+server_id+'_perms').attr('disabled', false);
-          $('.'+server_id+'_perms').attr('enabled', true);
-      }else{
-          $('.'+server_id+'_perms').prop('checked', false);
-          $('.'+server_id+'_perms').attr('disabled', true);
-          $('.'+server_id+'_perms').attr('enabled', false);
+        $('.' + server_id + '_perms').attr('disabled', false);
+        $('.' + server_id + '_perms').attr('enabled', true);
+      } else {
+        $('.' + server_id + '_perms').prop('checked', false);
+        $('.' + server_id + '_perms').attr('disabled', true);
+        $('.' + server_id + '_perms').attr('enabled', false);
       }
 
     }
     //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security
     function getCookie(name) {
-        var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
-        return r ? r[1] : undefined;
+      var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
+      return r ? r[1] : undefined;
     }
 
-    $( document ).ready(function() {
-        console.log( "ready!" );
+    $(document).ready(function () {
+      console.log("ready!");
     });
 
 
-</script>
+  </script>
 
-{% end %}
+  {% end %}
\ No newline at end of file
diff --git a/app/migrations/20220819_role_manager.py b/app/migrations/20220819_role_manager.py
new file mode 100644
index 00000000..0344b518
--- /dev/null
+++ b/app/migrations/20220819_role_manager.py
@@ -0,0 +1,16 @@
+# Generated by database migrator
+import peewee
+
+
+def migrate(migrator, database, **kwargs):
+    migrator.add_columns("roles", role_manager=peewee.IntegerField(null=True))
+    """
+    Write your migrations here.
+    """
+
+
+def rollback(migrator, database, **kwargs):
+    migrator.drop_columns("roles", ["role_manager"])
+    """
+    Write your rollback migrations here.
+    """