diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 9c1d608b5..a261f7643 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -661,7 +661,7 @@ void CertificatePage::loadFriendCert() {
 void CertificatePage::generateCertificateCalled() {
     qDebug() << "  generateCertificateCalled";
 
-    std::string cert = rsPeers->saveCertificateToString(rsPeers->getOwnId());
+    std::string cert = rsPeers->GetRetroshareInvite();
     if (cert.empty()) {
         QMessageBox::information(this, tr("RetroShare"),
                          tr("Sorry, create certificate failed"),
@@ -677,7 +677,7 @@ void CertificatePage::generateCertificateCalled() {
 
     if (qdir.isEmpty() == false) {
         QFile CertFile (qdir);
-        if (CertFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        if (CertFile.open(QIODevice::WriteOnly/* | QIODevice::Text*/)) {
             if (CertFile.write(QByteArray(cert.c_str())) > 0) {
                 QMessageBox::information(this, tr("RetroShare"),
                                  tr("Certificate file successfully created"),
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index b860d0e13..4e3e266a3 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -81,10 +81,10 @@ CryptoPage::load()
 void
 CryptoPage::loadPublicKey()
 {
-	QFont font("Courier New",9,50,false) ;
-	ui.certtextEdit->setFont(font) ;
+    QFont font("Courier New",9,50,false) ;
+    ui.certtextEdit->setFont(font) ;
 
-    ui.certtextEdit->setPlainText(QString::fromStdString(rsPeers->GetRetroshareInvite()));
+    ui.certtextEdit->setPlainText(QString::fromStdString(rsPeers->saveCertificateToString(rsPeers->getOwnId())));
     ui.certtextEdit->setReadOnly(true);
     ui.certtextEdit->setMinimumHeight(200);
 }