diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index b3f5dc8f..271f09f3 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -115,7 +115,7 @@ function add_user {
 }
 
 function pad_string {
-    echo -n -e "$1" | sed -e :a -e 's/^.\{1,15\}$/& /;ta'
+    echo -n -e "$1" | sed -e :a -e 's/^.\{1,25\}$/& /;ta'
 }
 
 function show_domains {
@@ -200,7 +200,7 @@ function show_users {
     for d in /home/*/ ; do
         USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
         if [[ $USRNAME != "git" ]]; then
-            echo -n -e "$(pad_string '${USRNAME}')"
+            echo -n -e "$(pad_string \"${USRNAME}\")"
             # get the SIP extension
             SIPEXT=
             while read ext; do
@@ -214,7 +214,7 @@ function show_users {
                 fi
             done < $SIP_CONFIG_FILE
             if [ $SIPEXT ]; then
-                echo -n -e "$(pad_string 'SIP:${SIPEXT}')"
+                echo -n -e "$(pad_string \"SIP:${SIPEXT}\")"
             else
                 echo -n -e "$(pad_string '')"
             fi