diff --git a/src/freedombone-app-edith b/src/freedombone-app-edith
index 990de143..72d58c17 100755
--- a/src/freedombone-app-edith
+++ b/src/freedombone-app-edith
@@ -266,7 +266,6 @@ function install_edith {
         fi
     fi
 
-    EDITH_ONION_HOSTNAME=$(add_onion_service edith 80 ${EDITH_ONION_PORT})
 
     if [ -d /var/www/$EDITH_DOMAIN_NAME/htdocs ]; then
         rm -rf /var/www/$EDITH_DOMAIN_NAME/htdocs
@@ -292,9 +291,11 @@ function install_edith {
     set_completion_param "edith commit" "$EDITH_COMMIT"
 
     if [ ! -d /var/www/$EDITH_DOMAIN_NAME/htdocs/data ]; then
-        mkdir /var/www/$EDITH_DOMAIN_NAME/htdocs/data
+        mkdir -p /var/www/$EDITH_DOMAIN_NAME/htdocs/data
     fi
 
+    EDITH_ONION_HOSTNAME=$(add_onion_service edith 80 ${EDITH_ONION_PORT})
+
     edith_nginx_site=/etc/nginx/sites-available/$EDITH_DOMAIN_NAME
     if [[ $ONION_ONLY == "no" ]]; then
         function_check nginx_http_redirect
@@ -423,6 +424,7 @@ function install_edith {
     fi
 
     set_completion_param "edith domain" "$EDITH_DOMAIN_NAME"
+    set_completion_param "edith onion domain" "$EDITH_ONION_HOSTNAME"
     chown -R www-data:www-data /var/www/$EDITH_DOMAIN_NAME/htdocs
     chmod a+w /var/www/$EDITH_DOMAIN_NAME/htdocs/data
     nginx_ensite $EDITH_DAEMON_NAME