diff --git a/src/components/runners/ImportRunnerModal.svelte b/src/components/runners/ImportRunnerModal.svelte
index 8e161051..1797dba1 100644
--- a/src/components/runners/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -19,6 +19,7 @@
   export let current_runners;
   export let import_modal_open;
   $: searchvalue = "";
+  $: importButtonEnabled = recent_processed && (!(selected_org_or_team == "" || selected_org_or_team == null) || !(passed_org?.id == null || passed_org?.id == 0) || !(passed_team?.id == null || passed_team?.id == 0)) 
   const dispatch = createEventDispatcher();
   function cancelModal() {
     json_output = [];
@@ -44,7 +45,10 @@
     groups = groups.concat(orgs);
     RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
       const teams = val.map((r) => {
-        return { label: `${r.parentGroup.name} > ${r.name}`, value: `TEAM_${r.id}` };
+        return {
+          label: `${r.parentGroup.name} > ${r.name}`,
+          value: `TEAM_${r.id}`,
+        };
       });
       groups = groups.concat(teams);
     });
@@ -190,86 +194,86 @@
 </script>
 
 {#if import_modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-auto"
-    use:focusTrap
-    use:clickOutside
-    on:click_outside={() => {
-      cancelModal();
-    }}>
+<div
+class="fixed z-10 inset-0 overflow-y-auto"
+use:focusTrap
+use:clickOutside
+on:click_outside={() => {
+  cancelModal();
+}}>
     <div
-      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop" />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span>
+    class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+    <div class="fixed inset-0 transition-opacity" aria-hidden="true">
       <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-max sm:w-full"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline">
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-          <div class="sm:flex sm:items-start">
-            <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                class="h-6 w-6 text-blue-600"
-                fill="currentColor"
-                width="24"
-                height="24"><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  d="M9.83 8.79L8 9.456V13H6V8.05h.015l5.268-1.918c.244-.093.51-.14.782-.131a2.616 2.616 0 0 1 2.427 1.82c.186.583.356.977.51 1.182A4.992 4.992 0 0 0 19 11v2a6.986 6.986 0 0 1-5.402-2.547l-.581 3.297L15 15.67V23h-2v-5.986l-2.05-1.987-.947 4.298-6.894-1.215.348-1.97 4.924.868L9.83 8.79zM13.5 5.5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" /></svg>
-            </div>
-            <div class="mt-3 text-center sm:mt-0 sm:ml-2 sm:text-left w-full">
-              <h3 class="text-lg leading-6 font-bold mt-2 text-gray-900">
-                {$_('runner-import')}
-              </h3>
-            </div>
-          </div>
-          <div class="mt-5 text-center sm:mt-0 sm:ml-2 sm:text-left w-full">
-            {#if json_output.length === 0}
-              <div class="mt-2 mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_('please-provide-the-required-csv-xlsx-file')}
-                </p>
-              </div>
-              <div class="overflow-hidden relative mt-4 mb-4">
-                <input
-                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-                  bind:files
-                  type="file" />
-              </div>
-            {/if}
-            {#if json_output.length > 0}
-              {#if opened_from === 'OrgOverview'}
-                <p>{$_('import__target-organization')}</p>
+      class="absolute inset-0 bg-gray-500 opacity-75"
+      data-id="modal_backdrop" />
+    </div>
+    <span
+    class="hidden sm:inline-block sm:align-middle sm:h-screen"
+    aria-hidden="true">&#8203;</span>
+    <div
+    class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-max sm:w-full"
+    role="dialog"
+    aria-modal="true"
+    aria-labelledby="modal-headline">
+    <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+      <div class="sm:flex sm:items-start">
+        <div
+        class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+        <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 24 24"
+        class="h-6 w-6 text-blue-600"
+        fill="currentColor"
+        width="24"
+        height="24"><path fill="none" d="M0 0h24v24H0z" />
+        <path
+        d="M9.83 8.79L8 9.456V13H6V8.05h.015l5.268-1.918c.244-.093.51-.14.782-.131a2.616 2.616 0 0 1 2.427 1.82c.186.583.356.977.51 1.182A4.992 4.992 0 0 0 19 11v2a6.986 6.986 0 0 1-5.402-2.547l-.581 3.297L15 15.67V23h-2v-5.986l-2.05-1.987-.947 4.298-6.894-1.215.348-1.97 4.924.868L9.83 8.79zM13.5 5.5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" /></svg>
+      </div>
+      <div class="mt-3 text-center sm:mt-0 sm:ml-2 sm:text-left w-full">
+        <h3 class="text-lg leading-6 font-bold mt-2 text-gray-900">
+          {$_('runner-import')}
+        </h3>
+      </div>
+    </div>
+    <div class="mt-5 text-center sm:mt-0 sm:ml-2 sm:text-left w-full">
+      {#if json_output.length === 0}
+      <div class="mt-2 mb-6">
+        <p class="text-sm text-gray-500">
+          {$_('please-provide-the-required-csv-xlsx-file')}
+        </p>
+      </div>
+      <div class="overflow-hidden relative mt-4 mb-4">
+        <input
+        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        bind:files
+        type="file" />
+      </div>
+      {/if}
+      {#if json_output.length > 0}
+      {#if opened_from === 'OrgOverview'}
+      <p>{$_('import__target-organization')}</p>
                 <select
-                  name="team"
-                  bind:value={selected_org}
-                  class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
-                  {#each passed_orgs as o}
-                    <option value={o.id}>{o.name}</option>
-                  {/each}
-                </select>
-                <p>{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}</p>
+                name="team"
+                bind:value={selected_org}
+                class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
+                {#each passed_orgs as o}
+                <option value={o.id}>{o.name}</option>
+                {/each}
+              </select>
+              <p>{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}</p>
               {/if}
               {#if opened_from === 'RunnerOverview'}
-                <p>{$_('group')}</p>
-                <Select
-                  containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
-                  itemFilter={(label, filterText, option) => label
+              <p>{$_('group')}</p>
+              <Select
+              containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+              itemFilter={(label, filterText, option) => label
                       .toLowerCase()
                       .includes(
                         filterText.toLowerCase()
-                      ) || option.id.value
-                      .toString()
-                      .startsWith(filterText.toLowerCase())}
+                        ) || option.id.value
+                        .toString()
+                        .startsWith(filterText.toLowerCase())}
                   items={groups}
                   showChevron={true}
                   placeholder={$_('search-for-an-organization-or-team-by-name-or-id')}
@@ -278,15 +282,15 @@
                     selected_org_or_team = selectedValue.detail.value;
                   }}
                   on:clear={() => (selected_org_or_team = null)} />
-              {/if}
-              {#if opened_from === 'OrgDetail'}
-                <p>
-                  {$_('runnerimport_verify_runners_org', {
-                    values: { org_name: passed_org.name },
-                  })}
+                  {/if}
+                  {#if opened_from === 'OrgDetail'}
+                  <p>
+                    {$_('runnerimport_verify_runners_org', {
+                      values: { org_name: passed_org.name },
+                    })}
                 </p>
-              {/if}
-              <input
+                {/if}
+                <input
                 type="search"
                 bind:value={searchvalue}
                 placeholder={$_('datatable.search')}
@@ -349,6 +353,8 @@
                   </table>
                 </div>
                 <button
+                  disabled={!importButtonEnabled}
+                  class:opacity-50={!importButtonEnabled}
                   on:click={importAction}
                   type="button"
                   class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">