diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
index 8b888027..7d1d1248 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
@@ -18,7 +18,7 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
+<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="OnSubmitAsync">
     <div class="flex flex-col gap-6">
 
         <FormValidationSummary/>
@@ -51,7 +51,7 @@
 </FormHandler>
 
 <DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="_ => FormHandler.SubmitAsync()">Save changes</WButtom>
+    <WButtom OnClick="SubmitAsync">Save changes</WButtom>
 </DialogFooter>
 
 @code
@@ -75,9 +75,12 @@
     private async Task SubmitAsync()
     {
         Request.Permissions = Permissions.ToArray();
-        
-        await OnSubmit.Invoke(Request);
+        await FormHandler.SubmitAsync();
+    }
 
+    private async Task OnSubmitAsync()
+    {
+        await OnSubmit.Invoke(Request);
         await CloseAsync();
     }
 }
diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
index 8db331d0..8878320f 100644
--- a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
+++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
@@ -20,7 +20,7 @@
     </DialogDescription>
 </DialogHeader>
 
-<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="SubmitAsync">
+<FormHandler @ref="FormHandler" Model="Request" OnValidSubmit="OnSubmitAsync">
     <div class="flex flex-col gap-6">
 
         <FormValidationSummary/>
@@ -53,7 +53,7 @@
 </FormHandler>
 
 <DialogFooter ClassName="justify-end gap-x-1">
-    <WButtom OnClick="_ => FormHandler.SubmitAsync()">Save changes</WButtom>
+    <WButtom OnClick="SubmitAsync">Save changes</WButtom>
 </DialogFooter>
 
 @code
@@ -74,9 +74,12 @@
     private async Task SubmitAsync()
     {
         Request.Permissions = Permissions.ToArray();
-        
-        await OnSubmit.Invoke(Request);
+        await FormHandler.SubmitAsync();
+    }
 
+    private async Task OnSubmitAsync()
+    {
+        await OnSubmit.Invoke(Request);
         await CloseAsync();
     }
 }