diff --git a/web/frontend/src/config/admin/EditProject.svelte b/web/frontend/src/config/admin/EditProject.svelte
index 3c87d46..53a4e7e 100644
--- a/web/frontend/src/config/admin/EditProject.svelte
+++ b/web/frontend/src/config/admin/EditProject.svelte
@@ -114,13 +114,13 @@
         class="btn btn-primary"
         type="button"
         id="add-project-button"
-        on:click|preventDefault={handleAddProject}>Add</button
+        on:click|preventDefault={() => handleAddProject}>Add</button
       >
       <button
         class="btn btn-danger"
         type="button"
         id="remove-project-button"
-        on:click|preventDefault={handleRemoveProject}>Remove</button
+        on:click|preventDefault={() => handleRemoveProject}>Remove</button
       >
     </div>
     <p>
diff --git a/web/frontend/src/config/admin/EditRole.svelte b/web/frontend/src/config/admin/EditRole.svelte
index b8d12bd..c02a253 100644
--- a/web/frontend/src/config/admin/EditRole.svelte
+++ b/web/frontend/src/config/admin/EditRole.svelte
@@ -119,13 +119,13 @@
         class="btn btn-primary"
         type="button"
         id="add-role-button"
-        on:click|preventDefault={handleAddRole}>Add</button
+        on:click|preventDefault={() => handleAddRole}>Add</button
       >
       <button
         class="btn btn-danger"
         type="button"
         id="remove-role-button"
-        on:click|preventDefault={handleRemoveRole}>Remove</button
+        on:click|preventDefault={() =>handleRemoveRole}>Remove</button
       >
     </div>
     <p>
diff --git a/web/frontend/src/config/admin/NoticeEdit.svelte b/web/frontend/src/config/admin/NoticeEdit.svelte
index 325800b..fba168f 100644
--- a/web/frontend/src/config/admin/NoticeEdit.svelte
+++ b/web/frontend/src/config/admin/NoticeEdit.svelte
@@ -63,7 +63,7 @@
           class="btn btn-primary"
           type="button"
           id="edit-notice-button"
-          on:click|preventDefault={handleEditNotice}>Edit Notice</button
+          on:click|preventDefault={() => handleEditNotice}>Edit Notice</button
         >
       </div>
       <p>
diff --git a/web/frontend/src/config/admin/Options.svelte b/web/frontend/src/config/admin/Options.svelte
index 3808834..a745c20 100644
--- a/web/frontend/src/config/admin/Options.svelte
+++ b/web/frontend/src/config/admin/Options.svelte
@@ -33,7 +33,7 @@
         type="checkbox"
         id="scramble-names-checkbox"
         style="margin-right: 1em;"
-        on:click={handleScramble}
+        on:click={() => handleScramble}
         bind:checked={scrambled}
       />
       Active?
diff --git a/web/frontend/src/config/admin/ShowUsers.svelte b/web/frontend/src/config/admin/ShowUsers.svelte
index d4988e8..dfe1c5b 100644
--- a/web/frontend/src/config/admin/ShowUsers.svelte
+++ b/web/frontend/src/config/admin/ShowUsers.svelte
@@ -53,7 +53,7 @@
       <Button
         color="secondary"
         size="sm"
-        on:click={reloadUserList}
+        on:click={() => reloadUserList}
         style="float: right;">Reload</Button
       >
     </p>
@@ -77,7 +77,7 @@
               <td
                 ><button
                   class="btn btn-danger del-user"
-                  on:click={deleteUser(user.username)}>Delete</button
+                  on:click={() => deleteUser(user.username)}>Delete</button
                 ></td
               >
             </tr>
diff --git a/web/frontend/src/config/admin/ShowUsersRow.svelte b/web/frontend/src/config/admin/ShowUsersRow.svelte
index 25c3710..a30dc79 100644
--- a/web/frontend/src/config/admin/ShowUsersRow.svelte
+++ b/web/frontend/src/config/admin/ShowUsersRow.svelte
@@ -30,7 +30,7 @@
 <td><code>{user?.roles ? user.roles.join(", ") : "No Roles"}</code></td>
 <td>
   {#if !jwt}
-    <Button color="success" on:click={getUserJwt(user.username)}
+    <Button color="success" on:click={() => getUserJwt(user.username)}
       >Gen. JWT</Button
     >
   {:else}
diff --git a/web/frontend/src/config/user/UserOptions.svelte b/web/frontend/src/config/user/UserOptions.svelte
index 0cdbe9f..b5641dc 100644
--- a/web/frontend/src/config/user/UserOptions.svelte
+++ b/web/frontend/src/config/user/UserOptions.svelte
@@ -137,7 +137,7 @@
             <CardBody>
                 <CardTitle>Generate JWT</CardTitle>
                 {#if jwt}
-                    <Button color="secondary" on:click={clipJwt()}>
+                    <Button color="secondary" on:click={() => clipJwt()}>
                         Copy JWT to Clipboard
                     </Button>
                     <p class="mt-2">
@@ -149,7 +149,7 @@
                         </p>
                     {/if}
                 {:else}
-                    <Button color="success" on:click={getUserJwt(username)}>
+                    <Button color="success" on:click={() => getUserJwt(username)}>
                         Generate JWT for '{username}'
                     </Button>
                     <p class="mt-2">
diff --git a/web/frontend/src/generic/helper/TextFilter.svelte b/web/frontend/src/generic/helper/TextFilter.svelte
index c47c979..08f1b2b 100644
--- a/web/frontend/src/generic/helper/TextFilter.svelte
+++ b/web/frontend/src/generic/helper/TextFilter.svelte
@@ -107,7 +107,7 @@
     placeholder={presetProject ? `Find ${mode} in ${scrambleNames ? scramble(presetProject) : presetProject} ...` : `Find ${mode} ...`}
   />
   {#if presetProject}
-  <Button title="Reset Project" on:click={resetProject}
+  <Button title="Reset Project" on:click={() => resetProject}
     ><Icon name="arrow-counterclockwise" /></Button
   >
   {/if}
diff --git a/web/frontend/src/generic/joblist/JobInfo.svelte b/web/frontend/src/generic/joblist/JobInfo.svelte
index a4a555c..bc47075 100644
--- a/web/frontend/src/generic/joblist/JobInfo.svelte
+++ b/web/frontend/src/generic/joblist/JobInfo.svelte
@@ -76,7 +76,7 @@
         <a href="/monitoring/job/{job.id}" target="_blank">{job.jobId}</a>
         ({job.cluster}) 
       </span>
-      <Button id={`${job.cluster}-${job.jobId}-clipboard`} outline color="secondary" size="sm" on:click={clipJobId(job.jobId)} >
+      <Button id={`${job.cluster}-${job.jobId}-clipboard`} outline color="secondary" size="sm" on:click={() => clipJobId(job.jobId)} >
         {#if displayCheck}
           <Icon name="clipboard2-check-fill"/>
         {:else}
diff --git a/web/frontend/src/generic/joblist/Pagination.svelte b/web/frontend/src/generic/joblist/Pagination.svelte
index 677bed8..a3c4543 100644
--- a/web/frontend/src/generic/joblist/Pagination.svelte
+++ b/web/frontend/src/generic/joblist/Pagination.svelte
@@ -29,13 +29,13 @@
     <div class="cc-pagination-right">
         {#if !backButtonDisabled}
         <button aria-label="page-reset"  class="reset nav" type="button"
-            on:click|preventDefault="{reset}"></button>
+            on:click|preventDefault={() => reset}></button>
         <button aria-label="page-back" class="left nav" type="button"
-            on:click|preventDefault="{() => { page -= 1; }}"></button>
+            on:click|preventDefault={() => { page -= 1; }}></button>
         {/if}
         {#if !nextButtonDisabled}
         <button aria-label="page-up" class="right nav" type="button"
-            on:click|preventDefault="{() => { page += 1; }}"></button>
+            on:click|preventDefault={() => { page += 1; }}></button>
         {/if}
     </div>
 </div>
diff --git a/web/frontend/src/generic/select/HistogramSelection.svelte b/web/frontend/src/generic/select/HistogramSelection.svelte
index 4e38123..572de11 100644
--- a/web/frontend/src/generic/select/HistogramSelection.svelte
+++ b/web/frontend/src/generic/select/HistogramSelection.svelte
@@ -88,7 +88,7 @@
     </ListGroup>
   </ModalBody>
   <ModalFooter>
-    <Button color="primary" on:click={closeAndApply}>Close & Apply</Button>
+    <Button color="primary" on:click={() => closeAndApply}>Close & Apply</Button>
     <Button color="secondary" on:click={() => (isOpen = !isOpen)}>Close</Button>
   </ModalFooter>
 </Modal>
diff --git a/web/frontend/src/generic/select/MetricSelection.svelte b/web/frontend/src/generic/select/MetricSelection.svelte
index 32e9292..92929ae 100644
--- a/web/frontend/src/generic/select/MetricSelection.svelte
+++ b/web/frontend/src/generic/select/MetricSelection.svelte
@@ -188,7 +188,7 @@
     </ListGroup>
   </ModalBody>
   <ModalFooter>
-    <Button color="primary" on:click={closeAndApply}>Close & Apply</Button>
+    <Button color="primary" on:click={() => closeAndApply}>Close & Apply</Button>
     <Button color="secondary" on:click={() => (isOpen = !isOpen)}>Cancel</Button>
   </ModalFooter>
 </Modal>