diff --git a/libresapi/src/api/PeersHandler.cpp b/libresapi/src/api/PeersHandler.cpp
index 09e30e58d..27e1e458f 100644
--- a/libresapi/src/api/PeersHandler.cpp
+++ b/libresapi/src/api/PeersHandler.cpp
@@ -422,7 +422,9 @@ void PeersHandler::handleWildcard(Request &req, Response &resp)
 		{
 			if(str == "self" && !req.mPath.empty() && req.mPath.top() == "certificate")
 			{
-				resp.mDataStream << makeKeyValue("cert_string", mRsPeers->GetRetroshareInvite(false));
+				resp.mDataStream << makeKeyValue(
+				                        "cert_string",
+				                        mRsPeers->GetRetroshareInvite());
 				resp.setOk();
 				return;
 			}
diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp
index de2c0b523..be6a86fbb 100644
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@@ -33,9 +33,9 @@
 #include <iostream>
 
 #define URL_FAQ         "http://retroshare.sourceforge.net/wiki/index.php/Frequently_Asked_Questions"
-#define URL_FORUM       "http://retroshare.sourceforge.net/forum/"
-#define URL_WEBSITE     "http://retroshare.org"
-#define URL_DOWNLOAD    "http://retroshare.sourceforge.net/downloads.html"
+#define URL_FORUM       "https://github.com/RetroShare/RetroShare/issues"
+#define URL_WEBSITE     "http://retroshare.net"
+#define URL_DOWNLOAD    "http://retroshare.net/downloads.html"
 
 #define EMAIL_SUBSCRIBE "lists@retroshare.org"
 
@@ -236,7 +236,7 @@ void GetStartedDialog::inviteFriends()
 	{
 		RsAutoUpdatePage::lockAllEvents();
 
-		cert = rsPeers->GetRetroshareInvite(false);
+		cert = rsPeers->GetRetroshareInvite();
 
 		RsAutoUpdatePage::unlockAllEvents() ;
 	}
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 2d994917c..71f2fe5b3 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -127,7 +127,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
     body = GetStartedDialog::GetInviteText();
 	
     body += "\n" + GetStartedDialog::GetCutBelowText();
-    body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite(false).c_str());
+	body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str());
 	
 	std::string advsetting;
 	if(rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
@@ -436,7 +436,7 @@ void ConnectFriendWizard::initializePage(int id)
 		QString body = ui->inviteTextEdit->toPlainText();
 
 		body += "\n" + GetStartedDialog::GetCutBelowText();
-		body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite(false).c_str());
+		body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str());
 
 		ui->inviteTextEdit->setPlainText(body);
 		}
@@ -797,7 +797,7 @@ bool ConnectFriendWizard::validateCurrentPage()
 			QString body = ui->inviteTextEdit->toPlainText();
 
 			body += "\n" + GetStartedDialog::GetCutBelowText();
-			body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite(false).c_str());
+			body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str());
 
 			sendMail (mailaddresses, ui->subjectEdit->text(), body);
 		}
@@ -998,7 +998,8 @@ void ConnectFriendWizard::accept()
 
 void ConnectFriendWizard::updateOwnCert()
 {
-	std::string invite = rsPeers->GetRetroshareInvite(ui->userCertIncludeSignaturesButton->isChecked());
+	std::string invite = rsPeers->GetRetroshareInvite( rsPeers->getOwnId(),
+	            ui->userCertIncludeSignaturesButton->isChecked() );
 
 	std::cerr << "TextPage() getting Invite: " << invite << std::endl;
 
@@ -1174,7 +1175,7 @@ void ConnectFriendWizard::generateCertificateCalled()
 	std::cerr << "  generateCertificateCalled" << std::endl;
 #endif
 
-	std::string cert = rsPeers->GetRetroshareInvite(false);
+	std::string cert = rsPeers->GetRetroshareInvite();
 	if (cert.empty()) {
 		QMessageBox::information(this, "RetroShare", tr("Sorry, create certificate failed"), QMessageBox::Ok, QMessageBox::Ok);
 		return;
diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
index cf238c7c0..81a86bc69 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(false);
+	std::string cert = rsPeers->GetRetroshareInvite();
     if (cert.empty()) {
         QMessageBox::information(this, tr("RetroShare"),
                          tr("Sorry, create certificate failed"),
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 4abe567c7..15419369b 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -96,8 +96,11 @@ CryptoPage::~CryptoPage()
 void
 CryptoPage::load()
 {
-    /* Loads ouer default Puplickey */
-    ui.certplainTextEdit->setPlainText(QString::fromUtf8(rsPeers->GetRetroshareInvite(ui._includeSignatures_CB->isChecked()).c_str()));
+	ui.certplainTextEdit->setPlainText(
+	            QString::fromUtf8(
+	                rsPeers->GetRetroshareInvite(
+	                    rsPeers->getOwnId(),
+	                    ui._includeSignatures_CB->isChecked() ).c_str() ) );
 }
 void
 CryptoPage::copyRSLink()