diff --git a/server/src/data/app.py b/server/src/data/app.py
index 4d1eb9b..a9e92f5 100644
--- a/server/src/data/app.py
+++ b/server/src/data/app.py
@@ -41,7 +41,7 @@ def submit():
     value = request.form.get("query")
     time_value = request.form.get("time")
     noshutdown = request.form.get("noshutdown")
-    if not value or not time_value:
+    if not value or (not time_value or not noshutdown):
         return redirect(url_for("mainpage"))
     conn = get_db_connection()
     cursor = conn.cursor()
diff --git a/server/src/data/templates/index.html b/server/src/data/templates/index.html
index 2e61d56..88679d7 100644
--- a/server/src/data/templates/index.html
+++ b/server/src/data/templates/index.html
@@ -46,9 +46,9 @@
                 <div class="d-flex justify-content-between align-items-center py-2">
                     <span class="text-white">{{ item.name }}</span>
                     {% if item.noshutdown %}
-                    <span class="text-green">OUI</span>
+                    <span class="text-success">OUI</span>
                     {% else %}
-                    <span class="text-red">NON</span>
+                    <span class="text-danger">NON</span>
                     <span class="text-white">{{ item.time }}</span>
                     {% endif %}
                     <form method="post" action="/delete" class="m-0 p-0">