diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final
index 5886db9e..c8905b72 100755
--- a/src/freedombone-utils-final
+++ b/src/freedombone-utils-final
@@ -124,6 +124,20 @@ function create_default_user_removal_daemon {
     systemctl enable firststart
 }
 
+function final_set_onion_hostname {
+    if [[ "$ONION_ONLY" == 'no' ]]; then
+        return
+    fi
+
+    if [ ! -f /var/lib/tor/hidden_service_email/hostname ]; then
+        echo $'No onion domain for email was found'
+        exit 368365
+    fi
+    onion_domain=$(cat /var/lib/tor/hidden_service_email/hostname)
+    echo "$onion_domain" > /etc/hostname
+    hostname "$onion_domain"
+}
+
 function setup_final {
     function_check update_installed_apps_list
     update_installed_apps_list
@@ -131,6 +145,9 @@ function setup_final {
     function_check create_default_user_removal_daemon
     create_default_user_removal_daemon
 
+    function_check final_set_onion_hostname
+    final_set_onion_hostname
+
     function_check install_tripwire
     install_tripwire