diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index b1127cd6..cf22d853 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -531,20 +531,22 @@ function install_irc_client {
     echo '    address = "irc.oftc.net";' >> /home/${MY_USERNAME}/.irssi/config
     echo '    chatnet = "OFTC";' >> /home/${MY_USERNAME}/.irssi/config
     echo '    port = "6667";' >> /home/${MY_USERNAME}/.irssi/config
-    echo '    autoconnect = "yes";' >> /home/${MY_USERNAME}/.irssi/config
+    echo '    autoconnect = "no";' >> /home/${MY_USERNAME}/.irssi/config
     echo '  },' >> /home/${MY_USERNAME}/.irssi/config
     echo '  {' >> /home/${MY_USERNAME}/.irssi/config
-    echo "    address = \"127.0.0.1\";" >> /home/${MY_USERNAME}/.irssi/config
     if [[ ${ONION_ONLY} == 'no' ]]; then
-        echo "    port = \"${IRC_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
+        echo "    address = \"${DEFAULT_DOMAIN_NAME}\";" >> /home/${MY_USERNAME}/.irssi/config
+        echo "    port = \"${IRC_BOUNCER_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
         echo '    use_ssl = "yes";' >> /home/${MY_USERNAME}/.irssi/config
+        echo '    ssl_verify = "yes";' >> /home/${MY_USERNAME}/.irssi/config
     else
         IRC_ONION_HOSTNAME=$(cat ${COMPLETION_FILE} | grep "irc onion domain" | head -n 1 | awk -F ':' '{print $2}')
+        echo "    address = \"127.0.0.1\";" >> /home/${MY_USERNAME}/.irssi/config
         echo "    port = \"${IRC_ONION_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
         echo '    use_ssl = "no";' >> /home/${MY_USERNAME}/.irssi/config
+        echo '    ssl_verify = "no";' >> /home/${MY_USERNAME}/.irssi/config
     fi
     echo '    chatnet = "Freedombone";' >> /home/${MY_USERNAME}/.irssi/config
-    echo '    ssl_verify = "no";' >> /home/${MY_USERNAME}/.irssi/config
     echo '    autoconnect = "yes";' >> /home/${MY_USERNAME}/.irssi/config
     if [ ${IRC_PASSWORD} ]; then
         echo "    password = \"${IRC_PASSWORD}\";" >> /home/${MY_USERNAME}/.irssi/config