diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp
index be6a86fbb..46e718315 100644
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@@ -236,7 +236,7 @@ void GetStartedDialog::inviteFriends()
 	{
 		RsAutoUpdatePage::lockAllEvents();
 
-		cert = rsPeers->GetRetroshareInvite();
+		cert = rsPeers->GetRetroshareInvite(RsPeerId(),false,false);
 
 		RsAutoUpdatePage::unlockAllEvents() ;
 	}
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 744826bbb..84d765dfb 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -562,7 +562,7 @@ RetroShareLink RetroShareLink::createCertificate(const RsPeerId& ssl_id)
 	} else {
 
 		link._type = TYPE_CERTIFICATE;
-		link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id,false).c_str());
+		link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id,false,false).c_str());
 		link._name = QString::fromUtf8(detail.name.c_str());
 		link._location = QString::fromUtf8(detail.location.c_str());
 		link._radix.replace("\n","");
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 640327b7a..3347e2911 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -1903,7 +1903,7 @@ bool FriendList::exportFriendlist(QString &fileName)
             if (!rsPeers->getPeerDetails(*list_iter, detailSSL))
                 continue;
 
-            std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, true);
+            std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, true,true);
             // remove \n from certificate
             certificate.erase(std::remove(certificate.begin(), certificate.end(), '\n'), certificate.end());
 
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index c6c86a0b1..e302cf02c 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -94,6 +94,7 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge
     connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(applyDialog()));
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(close()));
     connect(ui._shouldAddSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(loadInvitePage()));
+    connect(ui._includeIPHistory_CB, SIGNAL(toggled(bool)), this, SLOT(loadInvitePage()));
 
     ui.avatar->setFrameType(AvatarWidget::NORMAL_FRAME);
 
@@ -270,9 +271,14 @@ void ConfCertDialog::loadInvitePage()
 //	ui.userCertificateText_2->setFont(font);
 //	ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str()));
 
-	std::string invite = rsPeers->GetRetroshareInvite(detail.id,ui._shouldAddSignatures_CB->isChecked()) ; // this needs to be a SSL id
+	std::string invite = rsPeers->GetRetroshareInvite(detail.id,
+                                                      ui._shouldAddSignatures_CB->isChecked(),
+                                                      ui._includeIPHistory_CB->isChecked()
+                                                      ) ;
 
-    QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),true);	// true, because default parameter in GetRetroshareInvite is true
+    QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),
+                                                      ui._includeIPHistory_CB->isChecked()
+                                                 );
 
     ui.userCertificateText->setToolTip(infotext) ;
 
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
index fec736831..6a7082e17 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1104</width>
-    <height>1086</height>
+    <height>1120</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -69,7 +69,7 @@
       <item row="0" column="0">
        <widget class="QTabWidget" name="stabWidget">
         <property name="currentIndex">
-         <number>0</number>
+         <number>1</number>
         </property>
         <widget class="QWidget" name="tab">
          <attribute name="icon">
@@ -389,6 +389,13 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QCheckBox" name="_includeIPHistory_CB">
+              <property name="text">
+               <string>Include IP history</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <spacer name="horizontalSpacer_2">
               <property name="orientation">
@@ -414,12 +421,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>HeaderFrame</class>
-   <extends>QFrame</extends>
-   <header>gui/common/HeaderFrame.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>RSTextBrowser</class>
    <extends>QTextBrowser</extends>
@@ -431,6 +432,12 @@
    <header>gui/common/AvatarWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>HeaderFrame</class>
+   <extends>QFrame</extends>
+   <header>gui/common/HeaderFrame.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
index 81a86bc69..9151f90d3 100644
--- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
@@ -92,7 +92,7 @@ void ProfileWidget::statusmessagedlg()
 
 void ProfileWidget::copyCert()
 {
-	std::string cert = rsPeers->GetRetroshareInvite();
+	std::string cert = rsPeers->GetRetroshareInvite(RsPeerId(),false,false);
     if (cert.empty()) {
         QMessageBox::information(this, tr("RetroShare"),
                          tr("Sorry, create certificate failed"),