diff --git a/config_panel.toml b/config_panel.toml
index 565701f..0c26992 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -3,18 +3,34 @@
 version = "1.0"
 
 [main]
-name = "Settings"
+services = ["__APP__"]
 
-    [main.findmydevice_config]
-    name = "django-fmd configuration"
+    [main.config]
+    name = "Configuration Options"
 
-    # Trigger a service reload-or-restart after the user change a question in this panel
-    services = ["__APP__"]
+        [main.config.default_from_email]
+        ask = "from email"
+        type = "string"
+        help = "Default email address to use for various automated emails."
+        bind = "default_from_email:__FINALPATH__/settings.py"
 
-        [main.findmydevice_config.django_debug]
-        ask = "debug mode"
-        help = "Important: Never activate this settings.DEBUG on production!"
+        [main.config.admin_email]
+        ask = "ADMIN email"
+        type = "string"
+        help = "EMail address for error emails."
+        bind = "admin_email:__FINALPATH__/settings.py"
+
+        [main.config.debug_enabled]
+        ask = "DEBUG mode"
         type = "boolean"
-        yes = "True"
-        no = "False"
-        bind = "DJANGO_DEBUG:__FINALPATH__/local_settings.py"
+        yes = "1"
+        no = "0"
+        help = "Should be never enabled in production!"
+        bind = "debug_enabled:__FINALPATH__/settings.py"
+
+        [main.config.log_level]
+        type = "string"
+        ask = "Log Level"
+        choices = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+        default = "WARNING"
+        bind = "log_level:__FINALPATH__/settings.py"
diff --git a/manifest.json b/manifest.json
index 2d66dc0..ce723bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,7 @@
 	},
 	"multi_instance": false,
 	"services": [
-		"nginx"
+		"nginx", "postgresql", "redis"
 	],
 	"arguments": {
 		"install" : [