diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index e1cd80dcc..db2e88d35 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -50,19 +50,9 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
 
   //ui.genName->setFocus(Qt::OtherFocusReason);
 
-#ifndef WINDOWS_SYS /* UNIX */
-        std::string gpgEngineFileName;
-        if (RsInit::getPGPEngineFileName(gpgEngineFileName)) {
-            std::cerr << "RsInit::getPGPEngineFileName() : " << gpgEngineFileName << std::endl;
-            //if fileName contains gpg2 then the passphrase is set by pinentry and not by RS
-            QString *fileName = new QString(gpgEngineFileName.c_str());
-            if (fileName->contains("gpg2")) {
-                ui.genPGPpassword->hide();
-                ui.label_3->hide();
-            }
-        }
-        //comment those to show the pgp password field
- #endif
+    //the pgp password is now a GT box.
+    ui.genPGPpassword->hide();
+    ui.label_3->hide();
 
 #ifdef RS_USE_PGPSSL
         /* get all available pgp private certificates....
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index 98d852b26..03c8644f2 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -78,22 +78,14 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
 #ifndef WINDOWS_SYS /* UNIX */
 	//hide autologin because it's not functionnal on other than windows system
 	ui.autoBox->hide();
+#endif
 
 	//comment those to show the pgp and ssl password dialog
 	ui.loadPasswd->hide();
 	ui.label_4->hide();
 
-        std::string gpgEngineFileName;
-        if (RsInit::getPGPEngineFileName(gpgEngineFileName)) {
-            std::cerr << "RsInit::getPGPEngineFileName() : " << gpgEngineFileName << std::endl;
-            //if fileName contains gpg2 then the passphrase is set by pinentry and not by RS
-            QString *fileName = new QString(gpgEngineFileName.c_str());
-            if (fileName->contains("gpg2")) {
-                ui.loadGPGPasswd->hide();
-                ui.label_5->hide();
-            }
-        }
-#endif
+	ui.loadGPGPasswd->hide();
+	ui.label_5->hide();
 
 	/* get all available pgp private certificates....
 	 * mark last one as default.