diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index d5bae686..7a9662b9 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -884,10 +884,18 @@ function install_xmpp_main {
     fi
 
     # create a certificate
-    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
-        if [[ "$(cert_exists xmpp)" == "0" ]]; then
+    if [ ! -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
+        if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
             check_certificates xmpp
+            if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
+                echo $'Failed to create xmpp certificate'
+                exit 72352
+            fi
+            if [ ! -f /etc/ssl/private/xmpp.key ]; then
+                echo $'Failed to create xmpp private certificate'
+                exit 36829
+            fi
         fi
     fi
 
diff --git a/src/freedombone-config b/src/freedombone-config
index cf367faf..7d782895 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -253,7 +253,7 @@ function choose_dynamic_dns {
         data=$(tempfile 2>/dev/null)
         trap "rm -f $data" 0 1 2 5 15
         dialog --backtitle $"Freedombone Configuration" \
-               --radiolist $"Choose Dynamic DNS provider:" 16 40 15 \
+               --radiolist $"Choose Dynamic DNS provider:" 23 40 23 \
                1 dyndns off \
                2 freedns on \
                3 zoneedit off \