diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte
index 3b628584..f340388a 100644
--- a/src/components/scanstations/AddScanStationModal.svelte
+++ b/src/components/scanstations/AddScanStationModal.svelte
@@ -48,8 +48,9 @@
       ScanStationService.scanStationControllerPost(postdata)
         .then((result) => {
           description = "";
-          track = null;
+          track = tracks[0].id;
           enabled = true;
+          modal_open = false;
           //
           Toastify({
             text: "Scanstation added",
@@ -114,7 +115,8 @@
               </h3>
               <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  Please provide the required information to create a new scanstation
+                  Please provide the required information to create a new
+                  scanstation
                 </p>
               </div>
               <div class="grid grid-cols-6 gap-6">
@@ -127,9 +129,7 @@
                     bind:value={track}
                     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 tracks as t}
-                      <option value={t.id}>
-                        {t.name || t.distance}
-                      </option>
+                      <option value={t.id}>{t.name || t.distance}</option>
                     {/each}
                   </select>
                 </div>
@@ -146,19 +146,24 @@
                     name="description"
                     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" />
                 </div>
-                <!-- <div class="col-span-6">
+                <div class="col-span-6">
                   <label
-                    for="trackname"
-                    class="block text-sm font-medium text-gray-700">{$_('middle-name')}</label>
-                  <input
-                    autocomplete="off"
-                    placeholder={$_('middle-name')}
-                    bind:value={middlename_input_value}
-                    bind:this={middlename_input}
-                    type="text"
-                    name="trackname"
-                    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" />
-                </div> -->
+                    for="enabled"
+                    class="ml-1 font-medium text-gray-700">Enabled</label>
+                  <br />
+                  <p class="text-gray-500">
+                    <input
+                      id="enabled"
+                      on:change={() => {
+                        enabled = !enabled;
+                      }}
+                      name="enabled"
+                      type="checkbox"
+                      checked={enabled}
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+                    This scanstation is {#if enabled}enabled{:else}disabled{/if}
+                  </p>
+                </div>
               </div>
             </div>
           </div>