diff --git a/client/settings.cpp b/client/settings.cpp
index fc3a5825..6e470a33 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -312,10 +312,3 @@ ServerCredentials Settings::serverCredentials(int index) const
 
     return credentials;
 }
-
-bool Settings::isThirdPartyConfig(int serverIndex) const
-{
-    if (serverIndex < 0) return false;
-    const QJsonObject &s = server(serverIndex);
-    return s.value(config_key::isThirdPartyConfig).toBool();
-}
diff --git a/client/settings.h b/client/settings.h
index 56b28c18..c78b9a79 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -113,8 +113,6 @@ public:
     QByteArray backupAppConfig() const { return m_settings.backupAppConfig(); }
     bool restoreAppConfig(const QByteArray &cfg) { return m_settings.restoreAppConfig(cfg); }
 
-    bool isThirdPartyConfig(int serverIndex) const;
-
 private:
     SecureQSettings m_settings;
 
diff --git a/client/ui/pages_logic/ServerContainersLogic.cpp b/client/ui/pages_logic/ServerContainersLogic.cpp
index ba873eb2..27f865b5 100644
--- a/client/ui/pages_logic/ServerContainersLogic.cpp
+++ b/client/ui/pages_logic/ServerContainersLogic.cpp
@@ -38,8 +38,7 @@ void ServerContainersLogic::onPushButtonProtoSettingsClicked(DockerContainer c,
     uiLogic()->selectedDockerContainer = c;
     uiLogic()->protocolLogic(p)->updateProtocolPage(m_settings->protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, p),
                       uiLogic()->selectedDockerContainer,
-                      m_settings->haveAuthData(uiLogic()->selectedServerIndex),
-                      m_settings->isThirdPartyConfig(uiLogic()->selectedServerIndex));
+                      m_settings->haveAuthData(uiLogic()->selectedServerIndex));
 
     emit uiLogic()->goToProtocolPage(p);
 }
diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp
index 2a738fcf..09ebde9d 100644
--- a/client/ui/pages_logic/StartPageLogic.cpp
+++ b/client/ui/pages_logic/StartPageLogic.cpp
@@ -250,6 +250,7 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
 
     QJsonObject lastConfig;
     lastConfig[config_key::last_config] = QString(QJsonDocument(openVpnConfig).toJson());
+    lastConfig[config_key::isThirdPartyConfig] = true;
 
     QJsonObject containers;
     containers.insert(config_key::container, QJsonValue("amnezia-openvpn"));
@@ -268,7 +269,7 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
     QJsonObject o;
     o[config_key::containers] = arr;
     o[config_key::defaultContainer] = "amnezia-openvpn";
-    o[config_key::description] = QString("OpenVpn server %1").arg(hostName);
+    o[config_key::description] = QString("OpenVpn server");
 
 
     const static QRegularExpression dnsRegExp("dhcp-option DNS (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
@@ -282,8 +283,6 @@ bool StartPageLogic::importConnectionFromOpenVpnConfig(const QString &config)
 
     o[config_key::hostName] = hostName;
 
-    o[config_key::isThirdPartyConfig] = true;
-
     return importConnection(o);
 }
 
@@ -302,7 +301,8 @@ bool StartPageLogic::importConnectionFromWireguardConfig(const QString &config)
     }
 
     QJsonObject wireguardConfig;
-    wireguardConfig[config_key::last_config] = QString(QJsonDocument(lastConfig).toJson());;
+    wireguardConfig[config_key::last_config] = QString(QJsonDocument(lastConfig).toJson());
+    wireguardConfig[config_key::isThirdPartyConfig] = true;
     wireguardConfig[config_key::port] = port;
     wireguardConfig[config_key::transport_proto] = "udp";
 
@@ -316,7 +316,7 @@ bool StartPageLogic::importConnectionFromWireguardConfig(const QString &config)
     QJsonObject o;
     o[config_key::containers] = arr;
     o[config_key::defaultContainer] = "amnezia-wireguard";
-    o[config_key::description] = QString("Wireguard server %1").arg(hostName);
+    o[config_key::description] = QString("Wireguard server");
 
     const static QRegularExpression dnsRegExp("DNS = (\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b).*(\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\b)");
     QRegularExpressionMatch dnsMatch = dnsRegExp.match(config);
@@ -327,7 +327,5 @@ bool StartPageLogic::importConnectionFromWireguardConfig(const QString &config)
 
     o[config_key::hostName] = hostName;
 
-    o[config_key::isThirdPartyConfig] = true;
-
     return importConnection(o);
 }
diff --git a/client/ui/pages_logic/ViewConfigLogic.cpp b/client/ui/pages_logic/ViewConfigLogic.cpp
index 1dfe9abe..9ccd9d3e 100644
--- a/client/ui/pages_logic/ViewConfigLogic.cpp
+++ b/client/ui/pages_logic/ViewConfigLogic.cpp
@@ -13,6 +13,8 @@ void ViewConfigLogic::onUpdatePage()
 {
     set_configText(QJsonDocument(configJson()).toJson());
 
+    auto s = configJson()[config_key::isThirdPartyConfig].toBool();
+
     m_openVpnLastConfigs = m_openVpnMalStrings =
             "<style> \
             div { line-height: 0.5; } \
@@ -24,28 +26,42 @@ void ViewConfigLogic::onUpdatePage()
     const QJsonArray &containers = configJson()[config_key::containers].toArray();
     int i = 0;
     for (const QJsonValue &v: containers) {
-        QString cfg_json = v.toObject()[ProtocolProps::protoToString(Proto::OpenVpn)]
-                .toObject()[config_key::last_config].toString();
-
-        QString openvpn_cfg = QJsonDocument::fromJson(cfg_json.toUtf8()).object()[config_key::config]
-                .toString();
-
-        openvpn_cfg.replace("\r", "");
-
-        QStringList lines = openvpn_cfg.split("\n");
-        for (const QString &l: lines) {
-            i++;
-            QRegularExpressionMatch match = m_re.match(l);
-            if (dangerousTags.contains(match.captured(0))) {
-                QString t = QString("<p><font color=\"red\">%1</font>").arg(l);
-                m_openVpnLastConfigs.append(t + "\n");
-                m_openVpnMalStrings.append(t);
-                if (m_warningStringNumber == 3) m_warningStringNumber = i - 3;
-                m_warningActive = true;
-                qDebug() << "ViewConfigLogic : malicious scripts warning:" << l;
+        auto containerName = v.toObject()[config_key::container].toString();
+        QJsonObject containerConfig = v.toObject()[containerName.replace("amnezia-", "")].toObject();
+        if (containerConfig[config_key::isThirdPartyConfig].toBool()) {
+            auto lastConfig = containerConfig.value(config_key::last_config).toString();
+            auto lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
+            QStringList lines = lastConfigJson.value(config_key::config).toString().replace("\r", "").split("\n");
+            QString lastConfigText;
+            for (const QString &l: lines) {
+                    lastConfigText.append(l + "\n");
             }
-            else {
-                m_openVpnLastConfigs.append("<p>" + l + "&nbsp;\n");
+            set_configText(lastConfigText);
+        }
+
+
+        if (v.toObject()[config_key::container].toString() == "amnezia-openvpn") {
+            QString lastConfig = v.toObject()[ProtocolProps::protoToString(Proto::OpenVpn)]
+                    .toObject()[config_key::last_config].toString();
+
+            QString lastConfigJson = QJsonDocument::fromJson(lastConfig.toUtf8()).object()[config_key::config]
+                    .toString();
+
+            QStringList lines = lastConfigJson.replace("\r", "").split("\n");
+            for (const QString &l: lines) {
+                i++;
+                QRegularExpressionMatch match = m_re.match(l);
+                if (dangerousTags.contains(match.captured(0))) {
+                    QString t = QString("<p><font color=\"red\">%1</font>").arg(l);
+                    m_openVpnLastConfigs.append(t + "\n");
+                    m_openVpnMalStrings.append(t);
+                    if (m_warningStringNumber == 3) m_warningStringNumber = i - 3;
+                    m_warningActive = true;
+                    qDebug() << "ViewConfigLogic : malicious scripts warning:" << l;
+                }
+                else {
+                    m_openVpnLastConfigs.append("<p>" + l + "&nbsp;\n");
+                }
             }
         }
     }
diff --git a/client/ui/pages_logic/protocols/CloakLogic.cpp b/client/ui/pages_logic/protocols/CloakLogic.cpp
index 9faa5996..59019990 100644
--- a/client/ui/pages_logic/protocols/CloakLogic.cpp
+++ b/client/ui/pages_logic/protocols/CloakLogic.cpp
@@ -23,7 +23,7 @@ CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
 
 }
 
-void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig)
+void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData)
 {
     set_pageEnabled(haveAuthData);
     set_pushButtonSaveVisible(haveAuthData);
diff --git a/client/ui/pages_logic/protocols/CloakLogic.h b/client/ui/pages_logic/protocols/CloakLogic.h
index 8d4450fb..dc16f13c 100644
--- a/client/ui/pages_logic/protocols/CloakLogic.h
+++ b/client/ui/pages_logic/protocols/CloakLogic.h
@@ -28,7 +28,7 @@ public:
     explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~CloakLogic() = default;
 
-    void updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) override;
+    void updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData) override;
     QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
 
 private:
diff --git a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp b/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
index fbbf1c86..0ebfe9cb 100644
--- a/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
+++ b/client/ui/pages_logic/protocols/OpenVpnLogic.cpp
@@ -35,7 +35,7 @@ OpenVpnLogic::OpenVpnLogic(UiLogic *logic, QObject *parent):
 
 }
 
-void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig)
+void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData)
 {
     qDebug() << "OpenVpnLogic::updateProtocolPage";
     set_pageEnabled(haveAuthData);
@@ -96,8 +96,8 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
             openVpnLastConfigText.append(l + "\n");
     }
 
-    set_openVpnLastConfigText(m_openVpnLastConfigText);
-    set_isThirdPartyConfig(isThirdPartyConfig);
+    set_openVpnLastConfigText(openVpnLastConfigText);
+    set_isThirdPartyConfig(openvpnConfig.value(config_key::isThirdPartyConfig).isBool());
 }
 
 void OpenVpnLogic::onPushButtonProtoOpenVpnSaveClicked()
diff --git a/client/ui/pages_logic/protocols/OpenVpnLogic.h b/client/ui/pages_logic/protocols/OpenVpnLogic.h
index 76c481e6..472e10bc 100644
--- a/client/ui/pages_logic/protocols/OpenVpnLogic.h
+++ b/client/ui/pages_logic/protocols/OpenVpnLogic.h
@@ -45,7 +45,7 @@ public:
     explicit OpenVpnLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~OpenVpnLogic() = default;
 
-    void updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) override;
+    void updateProtocolPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData) override;
     QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
 
 private:
diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
index e10956a4..50b17a46 100644
--- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
+++ b/client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
@@ -36,7 +36,7 @@ OtherProtocolsLogic::~OtherProtocolsLogic()
 #endif
 }
 
-void OtherProtocolsLogic::updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig)
+void OtherProtocolsLogic::updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData)
 {
     set_labelTftpUserNameText(config.value(config_key::userName).toString());
     set_labelTftpPasswordText(config.value(config_key::password).toString(protocols::sftp::defaultUserName));
diff --git a/client/ui/pages_logic/protocols/OtherProtocolsLogic.h b/client/ui/pages_logic/protocols/OtherProtocolsLogic.h
index e4d3c6ab..508c2914 100644
--- a/client/ui/pages_logic/protocols/OtherProtocolsLogic.h
+++ b/client/ui/pages_logic/protocols/OtherProtocolsLogic.h
@@ -27,7 +27,7 @@ public:
     explicit OtherProtocolsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~OtherProtocolsLogic();
 
-    void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) override;
+    void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData) override;
     //QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
 
 private:
diff --git a/client/ui/pages_logic/protocols/PageProtocolLogicBase.h b/client/ui/pages_logic/protocols/PageProtocolLogicBase.h
index 75e0ac2e..ab66f8a9 100644
--- a/client/ui/pages_logic/protocols/PageProtocolLogicBase.h
+++ b/client/ui/pages_logic/protocols/PageProtocolLogicBase.h
@@ -17,7 +17,7 @@ public:
     explicit PageProtocolLogicBase(UiLogic *uiLogic, QObject *parent = nullptr);
     ~PageProtocolLogicBase() = default;
 
-    virtual void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) {}
+    virtual void updateProtocolPage(const QJsonObject &config, DockerContainer container, bool haveAuthData) {}
     virtual QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) { return QJsonObject(); }
 
 };
diff --git a/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp b/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
index e23f0bf8..1d5da936 100644
--- a/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
+++ b/client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
@@ -21,7 +21,7 @@ ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
 
 }
 
-void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig)
+void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
 {
     set_pageEnabled(haveAuthData);
     set_pushButtonSaveVisible(haveAuthData);
diff --git a/client/ui/pages_logic/protocols/ShadowSocksLogic.h b/client/ui/pages_logic/protocols/ShadowSocksLogic.h
index 6d2fbd1b..4e566825 100644
--- a/client/ui/pages_logic/protocols/ShadowSocksLogic.h
+++ b/client/ui/pages_logic/protocols/ShadowSocksLogic.h
@@ -26,7 +26,7 @@ public:
     explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~ShadowSocksLogic() = default;
 
-    void updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) override;
+    void updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData) override;
     QJsonObject getProtocolConfigFromPage(QJsonObject oldConfig) override;
 
 private:
diff --git a/client/ui/pages_logic/protocols/WireGuardLogic.cpp b/client/ui/pages_logic/protocols/WireGuardLogic.cpp
index d4c18df6..a6c661f5 100644
--- a/client/ui/pages_logic/protocols/WireGuardLogic.cpp
+++ b/client/ui/pages_logic/protocols/WireGuardLogic.cpp
@@ -12,7 +12,7 @@ WireGuardLogic::WireGuardLogic(UiLogic *logic, QObject *parent):
 
 }
 
-void WireGuardLogic::updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig)
+void WireGuardLogic::updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData)
 {
     qDebug() << "WireGuardLogic::updateProtocolPage";
 
@@ -26,5 +26,5 @@ void WireGuardLogic::updateProtocolPage(const QJsonObject &wireGuardConfig, Dock
     }
 
     set_wireGuardLastConfigText(wireGuardLastConfigText);
-    set_isThirdPartyConfig(isThirdPartyConfig);
+    set_isThirdPartyConfig(wireGuardConfig.value(config_key::isThirdPartyConfig).toBool());
 }
diff --git a/client/ui/pages_logic/protocols/WireGuardLogic.h b/client/ui/pages_logic/protocols/WireGuardLogic.h
index 19e9f90d..0b3bfc7b 100644
--- a/client/ui/pages_logic/protocols/WireGuardLogic.h
+++ b/client/ui/pages_logic/protocols/WireGuardLogic.h
@@ -16,7 +16,7 @@ public:
     explicit WireGuardLogic(UiLogic *uiLogic, QObject *parent = nullptr);
     ~WireGuardLogic() = default;
 
-    void updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData, bool isThirdPartyConfig) override;
+    void updateProtocolPage(const QJsonObject &wireGuardConfig, DockerContainer container, bool haveAuthData) override;
 
 private:
     UiLogic *m_uiLogic;
diff --git a/client/ui/qml/Pages/PageServerContainers.qml b/client/ui/qml/Pages/PageServerContainers.qml
index 4b05568a..b0e34922 100644
--- a/client/ui/qml/Pages/PageServerContainers.qml
+++ b/client/ui/qml/Pages/PageServerContainers.qml
@@ -32,6 +32,7 @@ PageBase {
 
     BackButton {
         id: back
+        onClicked: tb_c.currentIndex = -1
     }
     Caption {
         id: caption