diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index e908dd1c..65f346c5 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -6,37 +6,26 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <label  class="control-label">Name: </label>
+            <Label For="_name" Class="control-label" HelpText="Name Of The Role">Name: </Label>
         </td>
         <td>
-            <input class="form-control" @bind="@name" />
+            <input id="_name" class="form-control" @bind="@_name" />
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Description: </label>
+            <Label For="_description" Class="control-label" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description: </Label>
         </td>
         <td>
-            <textarea class="form-control" @bind="@description" rows="5"></textarea>
+            <textarea id="_description" class="form-control" @bind="@_description" rows="5"></textarea>
         </td>
     </tr>
     <tr>
         <td>
-            <label  class="control-label">Auto Assigned? </label>
+            <Label For="_isautoassigned" Class="control-label" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned? </Label>
         </td>
         <td>
-            <select class="form-control" @bind="@isautoassigned">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <label  class="control-label">System Role? </label>
-        </td>
-        <td>
-            <select class="form-control" @bind="@issystem">
+            <select id="_isautoassigned" class="form-control" @bind="@_isautoassigned">
                 <option value="True">Yes</option>
                 <option value="False">No</option>
             </select>
@@ -49,19 +38,18 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
-    string name = "";
-    string description = "";
-    string isautoassigned = "False";
-    string issystem = "False";
+    string _name = "";
+    string _description = "";
+    string _isautoassigned = "False";
 
     private async Task SaveRole()
     {
         Role role = new Role();
         role.SiteId = PageState.Page.SiteId;
-        role.Name = name;
-        role.Description = description;
-        role.IsAutoAssigned = (isautoassigned == null ? false : Boolean.Parse(isautoassigned));
-        role.IsSystem = (issystem == null ? false : Boolean.Parse(issystem));
+        role.Name = _name;
+        role.Description = _description;
+        role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
+        role.IsSystem = false;
 
         try
         {
diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
index ebbd5907..acea8de2 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor
@@ -31,17 +31,6 @@
             </select>
         </td>
     </tr>
-    <tr>
-        <td>
-            <Label For="_issystem" Class="control-label" HelpText="Indicates Whether Or Not This Is A System Role. System Roles Are Protected And Cannot Be Deleted.">System Role? </Label>
-        </td>
-        <td>
-            <select id="_issystem" class="form-control" @bind="@_issystem">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
 </table>
 <button type="button" class="btn btn-success" @onclick="SaveRole">Save</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
@@ -53,7 +42,6 @@
     string _name = "";
     string _description = "";
     string _isautoassigned = "False";
-    string _issystem = "False";
 
     protected override async Task OnInitializedAsync()
     {
@@ -66,7 +54,6 @@
                 _name = role.Name;
                 _description = role.Description;
                 _isautoassigned = role.IsAutoAssigned.ToString();
-                _issystem = role.IsSystem.ToString();
             }
         }
         catch (Exception ex)
@@ -82,7 +69,7 @@
         role.Name = _name;
         role.Description = _description;
         role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
-        role.IsSystem = (_issystem != null && Boolean.Parse(_issystem));
+        role.IsSystem = false;
 
         try
         {
diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
index 29378752..01372e80 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -17,8 +17,8 @@ else
             <th>Name</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 924112ac..a6522a07 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -30,7 +30,7 @@
 {
     if (Disabled)
     {
-        <button class="@Class" disabled @onclick="DisplayModal">@Text</button>
+        <button class="@Class" disabled>@Text</button>
     }
     else
     {
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 7585952f..48b8116e 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -6,7 +6,7 @@
 {
     if (Disabled)
     {
-        <NavLink class="@_classname" href="@_url" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</NavLink>
+        <button class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
     }
     else
     {
@@ -82,7 +82,7 @@
         if (!string.IsNullOrEmpty(IconName))
         {
             _iconSpan = $"<span class=\"oi oi-{IconName}\"></span>&nbsp;";
-        }        
+        }
 
         _url = EditUrl(Action, _parameters);
         _authorized = IsAuthorized();