diff --git a/src/single_window/remote_peer_window.cpp b/src/single_window/remote_peer_window.cpp
index 3932062..4fd3c95 100644
--- a/src/single_window/remote_peer_window.cpp
+++ b/src/single_window/remote_peer_window.cpp
@@ -159,9 +159,11 @@ int Render::ConnectTo(const std::string &remote_id, const char *password,
   auto props = client_properties_[remote_id];
   if (!props->connection_established_) {
     props->remember_password_ = remember_password;
-    if (strcmp(password, "") != 0) {
+    if (strcmp(password, "") != 0 &&
+        strcmp(password, props->remote_password_) != 0) {
       strncpy(props->remote_password_, password,
-              sizeof(props->remote_password_));
+              sizeof(props->remote_password_) - 1);
+      props->remote_password_[sizeof(props->remote_password_) - 1] = '\0';
     }
     ret = JoinConnection(props->peer_, remote_id.c_str(), password);
     if (0 == ret) {
diff --git a/thirdparty/projectx b/thirdparty/projectx
index 5b2961d..1621ab0 160000
--- a/thirdparty/projectx
+++ b/thirdparty/projectx
@@ -1 +1 @@
-Subproject commit 5b2961df184b63be22ec7fd8c1de1d5ecb5c16b2
+Subproject commit 1621ab04ed3e91591a0dafc443e5103e2f59a7f0