diff --git a/src/lib/components/cards/DriverCard.svelte b/src/lib/components/cards/DriverCard.svelte
index c93288f..08a5059 100644
--- a/src/lib/components/cards/DriverCard.svelte
+++ b/src/lib/components/cards/DriverCard.svelte
@@ -132,7 +132,9 @@
         disabled={disable_inputs}
         required={require_inputs}
       >
-        <svelte:fragment slot="message"><span class="font-bold">Upload Headshot</span></svelte:fragment>
+        <svelte:fragment slot="message"
+          ><span class="font-bold">Upload Headshot</span></svelte:fragment
+        >
       </FileDropzone>
 
       <!-- Save/Delete buttons -->
@@ -166,7 +168,13 @@
             Delete
           </Button>
         {:else}
-          <Button formaction="?/create_driver" color="tertiary" submit width="w-full">
+          <Button
+            formaction="?/create_driver"
+            color="tertiary"
+            submit
+            width="w-full"
+            disable={disable_inputs}
+          >
             Create Driver
           </Button>
         {/if}
diff --git a/src/lib/components/cards/RaceCard.svelte b/src/lib/components/cards/RaceCard.svelte
index 966390e..869bf65 100644
--- a/src/lib/components/cards/RaceCard.svelte
+++ b/src/lib/components/cards/RaceCard.svelte
@@ -169,7 +169,9 @@
         disabled={disable_inputs}
         required={require_inputs}
       >
-        <svelte:fragment slot="message"><span class="font-bold">Upload Pictogram</span></svelte:fragment>
+        <svelte:fragment slot="message"
+          ><span class="font-bold">Upload Pictogram</span></svelte:fragment
+        >
       </FileDropzone>
 
       <!-- Save/Delete buttons -->
@@ -197,9 +199,15 @@
             Delete
           </Button>
         {:else}
-          <Button formaction="?/create_race" color="tertiary" submit width="w-1/2"
-            >Create Race</Button
+          <Button
+            formaction="?/create_race"
+            color="tertiary"
+            submit
+            width="w-1/2"
+            disabled={disable_inputs}
           >
+            Create Race
+          </Button>
         {/if}
       </div>
     </div>
diff --git a/src/lib/components/cards/SubstitutionCard.svelte b/src/lib/components/cards/SubstitutionCard.svelte
index f4a69a0..4213370 100644
--- a/src/lib/components/cards/SubstitutionCard.svelte
+++ b/src/lib/components/cards/SubstitutionCard.svelte
@@ -170,7 +170,13 @@
             Delete
           </Button>
         {:else}
-          <Button formaction="?/create_substitution" color="tertiary" submit width="w-full">
+          <Button
+            formaction="?/create_substitution"
+            color="tertiary"
+            submit
+            width="w-full"
+            disabled={disable_inputs}
+          >
             Create Substitution
           </Button>
         {/if}
diff --git a/src/lib/components/cards/TeamCard.svelte b/src/lib/components/cards/TeamCard.svelte
index d63d728..e7308b9 100644
--- a/src/lib/components/cards/TeamCard.svelte
+++ b/src/lib/components/cards/TeamCard.svelte
@@ -108,7 +108,9 @@
         disabled={disable_inputs}
         required={require_inputs}
       >
-        <svelte:fragment slot="message"><span class="font-bold">Upload Banner</span></svelte:fragment>
+        <svelte:fragment slot="message"
+          ><span class="font-bold">Upload Banner</span></svelte:fragment
+        >
       </FileDropzone>
 
       <!-- Logo upload -->
@@ -156,9 +158,15 @@
             Delete
           </Button>
         {:else}
-          <Button formaction="?/create_team" color="tertiary" submit width="w-full"
-            >Create Team</Button
+          <Button
+            formaction="?/create_team"
+            color="tertiary"
+            submit
+            width="w-full"
+            disabled={disable_inputs}
           >
+            Create Team
+          </Button>
         {/if}
       </div>
     </div>