diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index ef64d9a687b7ecd3b2e856f450f553d0d1749c16..057a9d3ee14fba8193ab7fb63a29965ff74da852 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1516,7 +1516,7 @@ function show_firewall {
     while read line; do
         firewall_name=$(echo "$line" | awk -F '=' '{print $1}')
         firewall_port=$(echo "$line" | awk -F '=' '{print $2}')
-        echo -n -e "$(pad_string \"${firewall_name}\")"
+        echo -n -e "$(pad_string ${firewall_name})"
         echo "${firewall_port}"
     done < $FIREWALL_CONFIG
     any_key
diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index 211d0d13cbbfd6885fee5af518748f21ed2388ff..0b4b8736e869f2fe4b4dde2d1d128c3dc892f51e 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -305,7 +305,7 @@ function mesh_firewall {
 }
 
 function firewall_add {
-    firewall_name="$1"
+    firewall_name=$(echo "$1" | sed "s| |-|g")
     firewall_port=$2
     firewall_protocol="$3"