diff --git a/server/src/data/app.py b/server/src/data/app.py
index a9e92f5..026b492 100644
--- a/server/src/data/app.py
+++ b/server/src/data/app.py
@@ -41,6 +41,10 @@ def submit():
     value = request.form.get("query")
     time_value = request.form.get("time")
     noshutdown = request.form.get("noshutdown")
+    if not noshutdown:
+        noshutdown = 0
+    else:
+        noshutdown = 1
     if not value or (not time_value or not noshutdown):
         return redirect(url_for("mainpage"))
     conn = get_db_connection()
diff --git a/server/src/data/templates/index.html b/server/src/data/templates/index.html
index 88679d7..a202b6e 100644
--- a/server/src/data/templates/index.html
+++ b/server/src/data/templates/index.html
@@ -13,14 +13,6 @@
                     class="form-control bg-dark text-white"
                     placeholder="Nom de la machine">
             </div>
-            <div class="col-md-2">
-                <div class="form-check text-white">
-                    <input class="form-check-input" type="checkbox" name="noshutdown" id="noshutdown">
-                    <label class="form-check-label" for="noshutdown">
-                        Whitelist shutdown
-                    </label>
-                </div>
-            </div>
             <div class="col-md-2">
                 <select name="time" class="form-select bg-dark text-white" id="time-select">
                     {% for hour in range(0, 24) %}
@@ -29,7 +21,14 @@
                     {% endfor %}
                 </select>
             </div>
-
+            <div class="col-md-2">
+                <div class="form-check text-white">
+                    <input class="form-check-input" type="checkbox" name="noshutdown" id="noshutdown">
+                    <label class="form-check-label" for="noshutdown">
+                        Whitelist shutdown
+                    </label>
+                </div>
+            </div>
             <div class="col-auto">
                 <button type="submit" class="btn btn-secondary">
                     Ajouter