diff --git a/src/ui/main.py b/src/ui/main.py
index 6ff0ff7ab..0b953973a 100755
--- a/src/ui/main.py
+++ b/src/ui/main.py
@@ -422,15 +422,20 @@ def services():
             flash("Missing OLD_SERVER_NAME parameter.", "error")
             return redirect(url_for("loading", next=url_for("services")))
 
+        if "SERVER_NAME" not in variables:
+            variables["SERVER_NAME"] = variables["OLD_SERVER_NAME"]
+
         if request.form["operation"] in ("new", "edit"):
             del variables["operation"]
-
-            if request.form["operation"] == "edit":
-                del variables["OLD_SERVER_NAME"]
+            del variables["OLD_SERVER_NAME"]
 
             # Edit check fields and remove already existing ones
             config = app.config["CONFIG"].get_config()
             for variable in deepcopy(variables):
+                if variables.endswith("_SCHEMA"):
+                    del variables[variable]
+                    continue
+
                 if variables[variable] == "on":
                     variables[variable] = "yes"
                 elif variables[variable] == "off":
diff --git a/src/ui/src/Config.py b/src/ui/src/Config.py
index ae80c8c79..ea9910b61 100644
--- a/src/ui/src/Config.py
+++ b/src/ui/src/Config.py
@@ -249,7 +249,7 @@ class Config:
             if k in self.__plugins_settings:
                 if _global ^ (self.__plugins_settings[k]["context"] == "global"):
                     error = 1
-                    flash(f"Variable {k} is not valid.")
+                    flash(f"Variable {k} is not valid.", "error")
                     continue
 
                 setting = k
@@ -260,7 +260,7 @@ class Config:
                     or "multiple" not in self.__plugins_settings[setting]
                 ):
                     error = 1
-                    flash(f"Variable {k} is not valid.")
+                    flash(f"Variable {k} is not valid.", "error")
                     continue
 
             if not (
@@ -270,7 +270,7 @@ class Config:
 
             if not check:
                 error = 1
-                flash(f"Variable {k} is not valid.")
+                flash(f"Variable {k} is not valid.", "error")
                 continue
 
         return error