diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp
index 0b26cb79..9375cd1d 100644
--- a/client/core/servercontroller.cpp
+++ b/client/core/servercontroller.cpp
@@ -24,6 +24,12 @@
 
 using namespace QSsh;
 
+Settings &ServerController::m_settings()
+{
+    static Settings s;
+    return s;
+}
+
 ErrorCode ServerController::runScript(const ServerCredentials &credentials, QString script,
     const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdOut,
     const std::function<void(const QString &, QSharedPointer<SshRemoteProcess>)> &cbReadStdErr)
@@ -678,6 +684,8 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
 
     vars.append({{"$IPSEC_VPN_C2C_TRAFFIC", "no"}});
 
+    vars.append({{"$PRIMARY_SERVER_DNS", m_settings().primaryDns()}});
+    vars.append({{"$SECONDARY_SERVER_DNS", m_settings().secondaryDns()}});
 
 
     // Sftp vars
diff --git a/client/core/servercontroller.h b/client/core/servercontroller.h
index 30e86ff4..f29b6fd5 100644
--- a/client/core/servercontroller.h
+++ b/client/core/servercontroller.h
@@ -6,6 +6,8 @@
 #include "sshconnection.h"
 #include "sshremoteprocess.h"
 #include "defs.h"
+#include "settings.h"
+
 #include "containers/containers_defs.h"
 
 #include "sftpdefs.h"
@@ -75,6 +77,7 @@ private:
     static ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
     static ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
 
+    static Settings &m_settings();
 };
 
 #endif // SERVERCONTROLLER_H
diff --git a/client/server_scripts/ipsec/configure_container.sh b/client/server_scripts/ipsec/configure_container.sh
index 93297f55..76c4dfaf 100644
--- a/client/server_scripts/ipsec/configure_container.sh
+++ b/client/server_scripts/ipsec/configure_container.sh
@@ -120,8 +120,8 @@ proxyarp
 lcp-echo-failure 4
 lcp-echo-interval 30
 connect-delay 5000
-ms-dns $PRIMARY_DNS
-ms-dns $SECONDARY_DNS
+ms-dns $PRIMARY_SERVER_DNS
+ms-dns $SECONDARY_SERVER_DNS
 EOF
 
 
@@ -250,7 +250,7 @@ conn ikev2-cp
   ikelifetime=24h
   salifetime=24h
   encapsulation=yes
-  modecfgdns=$PRIMARY_DNS,$SECONDARY_DNS
+  modecfgdns=$PRIMARY_SERVER_DNS,$SECONDARY_SERVER_DNS
 EOF
 
  ipsec auto --add ikev2-cp
diff --git a/client/server_scripts/website_tor/run_container.sh b/client/server_scripts/website_tor/run_container.sh
index 11adb569..e5dfce98 100644
--- a/client/server_scripts/website_tor/run_container.sh
+++ b/client/server_scripts/website_tor/run_container.sh
@@ -1,3 +1,6 @@
 # Run container
+sudo docker stop amnezia-tor
+sudo docker rm amnezia-tor
 sudo docker run -d -p 80:80 --restart always --name $CONTAINER_NAME tutum/wordpress
 sudo docker run -d --link $CONTAINER_NAME --name amnezia-tor goldy/tor-hidden-service
+sudo docker exec -i amnezia-tor apk add bash
diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
index 77a87760..7d532367 100644
--- a/client/ui/uilogic.cpp
+++ b/client/ui/uilogic.cpp
@@ -104,6 +104,8 @@ UiLogic::UiLogic(QObject *parent) :
 
 UiLogic::~UiLogic()
 {
+    m_tray = nullptr;
+
     emit hide();
 
     if (m_vpnConnection->connectionState() != VpnProtocol::ConnectionState::Disconnected) {
@@ -609,7 +611,7 @@ void UiLogic::setupTray()
 
 void UiLogic::setTrayIcon(const QString &iconPath)
 {
-    m_tray->setIcon(QIcon(QPixmap(iconPath).scaled(128,128)));
+    if (m_tray) m_tray->setIcon(QIcon(QPixmap(iconPath).scaled(128,128)));
 }
 
 void UiLogic::onTrayActivated(QSystemTrayIcon::ActivationReason reason)