diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp
index 826e6c07..1a08cc32 100644
--- a/client/protocols/openvpnovercloakprotocol.cpp
+++ b/client/protocols/openvpnovercloakprotocol.cpp
@@ -94,16 +94,6 @@ void OpenVpnOverCloakProtocol::stop()
 
     qDebug() << "OpenVpnOverCloakProtocol::stop()";
 
-#ifdef Q_OS_WIN
-    Utils::signalCtrl(m_ckProcess.processId(), CTRL_C_EVENT);
-#endif
-
-    m_ckProcess.terminate();
-
-    if (Utils::processIsRunning(Utils::executable("ck-client", false))) {
-        QThread::msleep(1000);
-        Utils::killProcessByName(Utils::executable("ck-client", false));
-    }
 }
 
 QString OpenVpnOverCloakProtocol::cloakExecPath()
diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp
index f65031a3..6af21c35 100644
--- a/client/protocols/openvpnprotocol.cpp
+++ b/client/protocols/openvpnprotocol.cpp
@@ -84,12 +84,12 @@ void OpenVpnProtocol::readOpenVpnConfiguration(const QJsonObject &configuration)
             QJsonObject cloakConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::Cloak)).toObject();
             cloakConfig["NumConn"] = 1;
             cloakConfig["ProxyMethod"] = "openvpn";
-            if (cloakConfig.contains("port")){
+            if (cloakConfig.contains("port")) {
                 int portValue = cloakConfig.value("port").toInt();
                 cloakConfig.remove("port");
                 cloakConfig["RemotePort"] = portValue;
             }
-            if (cloakConfig.contains("remote")){
+            if (cloakConfig.contains("remote")) {
                 QString hostValue = cloakConfig.value("remote").toString();
                 cloakConfig.remove("remote");
                 cloakConfig["RemoteHost"] = hostValue;
diff --git a/client/utilities.cpp b/client/utilities.cpp
index 158bce93..ef4e2ea0 100644
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -226,13 +226,13 @@ QStringList Utils::summarizeRoutes(const QStringList &ips, const QString cidr)
 QString Utils::openVpnExecPath()
 {
 #ifdef Q_OS_WIN
-    return Utils::executable("openvpn/openvpn", true);
+    return Utils::executable("openvpn/ovpncli", true);
 #elif defined Q_OS_LINUX
     // We have service that runs OpenVPN on Linux. We need to make same
     // path for client and service.
-    return Utils::executable("../../client/bin/openvpn", true);
+    return Utils::executable("../../client/bin/ovpncli", true);
 #else
-    return Utils::executable("/openvpn", true);
+    return Utils::executable("ovpncli", true);
 #endif
 }
 
diff --git a/service/server/tapcontroller_win.cpp b/service/server/tapcontroller_win.cpp
index 6655e75f..0fc8f454 100644
--- a/service/server/tapcontroller_win.cpp
+++ b/service/server/tapcontroller_win.cpp
@@ -261,7 +261,7 @@ QString TapController::getTapInstallPath()
 
 QString TapController::getOpenVpnPath()
 {
-    return qApp->applicationDirPath() + "\\openvpn\\openvpn.exe";
+    return qApp->applicationDirPath() + "\\openvpn\\ovpncli.exe";
 }
 
 QString TapController::getTapDriverDir()