diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 0330c2602..df689f97a 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = retroshare-nogui
 CONFIG += bitdht
 #CONFIG += introserver
-CONFIG += sshserver
+#CONFIG += sshserver
 CONFIG -= qt xml gui
 
 # if you are linking against the libretroshare with gxs.
@@ -106,7 +106,20 @@ macx {
     # ENABLE THIS OPTION FOR Univeral Binary BUILD.
     # CONFIG += ppc x86 
 
-    LIBS += -Wl,-search_paths_first
+	LIBS += -Wl,-search_paths_first
+
+	LIBS += ../../libretroshare/src/lib/libretroshare.a
+	LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
+        LIBS += -lssl -lcrypto -lz 
+	LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
+	LIBS += -framework CoreFoundation
+	LIBS += -framework Security
+
+	gxs {
+		# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
+	    # LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
+	    LIBS += ../../../lib/libsqlcipher.a
+	}
 }
 
 ##################################### FreeBSD ######################################
diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc
index 44d8712a7..4c3db5cff 100644
--- a/retroshare-nogui/src/retroshare.cc
+++ b/retroshare-nogui/src/retroshare.cc
@@ -237,15 +237,7 @@ int main(int argc, char **argv)
 	RsControl *rsServer = createRsControl(*notify);
 	rsicontrol = rsServer ;
 
-	std::string preferredId, gpgId, gpgName, gpgEmail, sslName;
-	RsInit::getPreferedAccountId(preferredId);
-
-	if (RsInit::getAccountDetails(preferredId, gpgId, gpgName, gpgEmail, sslName))
-	{
-		RsInit::SelectGPGAccount(gpgId);
-	}
-
-	/* Key + Certificate are loaded into libretroshare */
+	/* PreferredId => Key + Certificate are loaded into libretroshare */
 
 	std::string error_string ;
 	int retVal = RsInit::LockAndLoadCertificates(false,error_string);