diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index eb098b21..048b6397 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -177,6 +177,7 @@ function show_domains {
         GOGSDOM=$(cat ${COMPLETION_FILE} | grep 'Gogs domain' | awk -F ':' '{print $2}')
         echo -n -e "$(pad_string ${GOGSDOM})"
         if [ -d /var/lib/tor/hidden_service_git ]; then
+			/var/lib/tor/hidden_service_gogs/hostname
             echo -n "$(cat /var/lib/tor/hidden_service_gogs/hostname)"
         fi
         echo ''
@@ -200,7 +201,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 +215,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