diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index bde63b93e..f864403f6 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -139,6 +139,9 @@ void QuickStartWizard::on_pushButtonConnectionNext_clicked()
         }
         rsicontrol->ConfigSetDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
 
+        if (ui.DynDNS->text().toStdString() != detail.dyndns)
+            rsPeers->setDynDNS (rsPeers->getOwnId(), ui.DynDNS->text().toStdString());
+
         ui.pagesWizard->setCurrentIndex(2);
 }
 
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index b0f292f79..dd4feef83 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -136,6 +136,10 @@ ConnectFriendWizard::accept()
                 std::cerr << "ConnectFriendWizard::accept() : setting ip local address." << std::endl;
                 rsPeers->setLocalAddress(ssl_Id, this->field("local_friend_ip").toString().toStdString(), this->field("local_friend_port").toInt());
             }
+            if (!this->field("dyndns").isNull()) {
+                std::cerr << "ConnectFriendWizard::accept() : setting DynDNS." << std::endl;
+                rsPeers->setDynDNS(ssl_Id, this->field("dyndns").toString().toStdString());
+            }
             if (!this->field(LOCATION_FIELD_CONNECT_FRIEND_WIZARD).isNull()) {
                 std::cerr << "ConnectFriendWizard::accept() : setting peerLocation." << std::endl;
                 rsPeers->setLocation(ssl_Id, this->field(LOCATION_FIELD_CONNECT_FRIEND_WIZARD).toString().toStdString());
@@ -396,6 +400,7 @@ int TextPage::nextId() const {
         wizard()->setField("ext_friend_port", QString::number(pd.extPort));
         wizard()->setField("local_friend_ip", QString::fromStdString(pd.localAddr));
         wizard()->setField("local_friend_port", QString::number(pd.localPort));
+        wizard()->setField("dyndns", QString::fromStdString(pd.dyndns));
 
         return ConnectFriendWizard::Page_Conclusion ;
     }
@@ -828,6 +833,10 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
     local_friend_port = new QLineEdit(this);
     local_friend_port->setVisible(false);
     registerField("local_friend_port",local_friend_port);
+
+    dyndns = new QLineEdit(this);
+    dyndns->setVisible(false);
+    registerField("dyndns",dyndns);
 }
 
 //============================================================================
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
index 4f0a11d2e..0e538b4c2 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.h
@@ -236,6 +236,7 @@ private:
     QLineEdit* ext_friend_port;
     QLineEdit* local_friend_ip;
     QLineEdit* local_friend_port;
+    QLineEdit* dyndns;
 };
 
 //============================================================================