diff --git a/frontend/src/components/manage/FormInputRow.svelte b/frontend/src/components/manage/FormInputRow.svelte
index dca8345..be3fd75 100644
--- a/frontend/src/components/manage/FormInputRow.svelte
+++ b/frontend/src/components/manage/FormInputRow.svelte
@@ -87,7 +87,7 @@
 
   {#if withCreateButton}
     <div class="row" style="justify-content: center; margin-top: 10px">
-      <Button type="submit" icon="fas fa-plus">Add Input</Button>
+      <Button type="submit" icon="fas fa-plus" {disabled}>Add Input</Button>
     </div>
   {/if}
 </form>
@@ -108,6 +108,7 @@
   export let withSaveButton = false;
   export let withDeleteButton = false;
   export let withDirectionButtons = false;
+  export let disabled = false;
 
   export let index;
   export let formLength;
diff --git a/frontend/src/views/Forms.svelte b/frontend/src/views/Forms.svelte
index 2434894..c6a1dcc 100644
--- a/frontend/src/views/Forms.svelte
+++ b/frontend/src/views/Forms.svelte
@@ -53,7 +53,7 @@
             {/if}
 
             {#if activeFormId !== null}
-              <FormInputRow bind:data={inputCreationData} withCreateButton={true}
+              <FormInputRow bind:data={inputCreationData} withCreateButton={true} disabled={formLength >= 5}
                             on:create={(e) => createInput(e.detail)}/>
             {/if}
           </div>
diff --git a/frontend/src/views/Transcripts.svelte b/frontend/src/views/Transcripts.svelte
index d939dcc..f5c787b 100644
--- a/frontend/src/views/Transcripts.svelte
+++ b/frontend/src/views/Transcripts.svelte
@@ -128,18 +128,26 @@
         filterSettings.userId = undefined;
 
         if (filterSettings.ticketId === "") {
-          filterSettings.ticketId = undefined;
+            filterSettings.ticketId = undefined;
         }
     };
 
     let handleInputUsername = () => {
         filterSettings.ticketId = undefined;
         filterSettings.userId = undefined;
+
+        if (filterSettings.username === "") {
+            filterSettings.username = undefined;
+        }
     };
 
     let handleInputUserId = () => {
         filterSettings.ticketId = undefined;
         filterSettings.username = undefined;
+
+        if (filterSettings.userId === "") {
+           filterSettings.userId = undefined;
+        }
     };
 
     let loading = false;