diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc
index e0d17fc55..dc16698fb 100644
--- a/libretroshare/src/pqi/authssl.cc
+++ b/libretroshare/src/pqi/authssl.cc
@@ -2185,10 +2185,10 @@ int AuthSSL::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx)
             //sslcert *cert = NULL;
             std::string certId;
             getX509id(X509_STORE_CTX_get_current_cert(ctx), certId);
-//            if (!mConnMgr->isFriend(certId)) {
-//                //we've got a new ssl id
-//                preverify_ok = false;
-//            }
+            if (!mConnMgr->isFriend(certId)) {
+                //we've got a new ssl id
+                preverify_ok = false;
+            }
 
             //is the connection was initiated by us, then it was for a specific peer id wich is stored is in the context
             //check that the peerid in the context is the same as the cert one
@@ -2211,13 +2211,13 @@ int AuthSSL::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx)
                 }
             }
 
-            //Add, even if it might already be added
+            //just to be sure
             mConnMgr->addFriend(certId, getX509CNString(X509_STORE_CTX_get_current_cert(ctx)->cert_info->issuer));
 
             //set location
             mConnMgr->setLocation(certId, getX509LocString(X509_STORE_CTX_get_current_cert(ctx)->cert_info->subject));
 
-            //Check if peer isn't already connected
+            //Cgheck if peer isn't already connected
             peerConnectState detail;
             if (mConnMgr->getFriendNetStatus(certId, detail)) {
                 if (detail.state & RS_PEER_CONNECTED && detail.connecttype & RS_NET_CONN_TUNNEL) {
diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc
index 6793d8cf7..fb9706aef 100644
--- a/libretroshare/src/pqi/p3connmgr.cc
+++ b/libretroshare/src/pqi/p3connmgr.cc
@@ -2005,24 +2005,23 @@ bool p3ConnectMgr::addFriend(std::string id, std::string gpg_id, uint32_t netMod
                 /* (1) already exists */
                 return false;
     }
-    /* so four possibilities
-     * (1) already exists as friend -> do nothing.
-     * (2) is in others list -> move over.
-     * (3) is non-existant -> create new one.
-     */
+        /* so four possibilities
+	 * (1) already exists as friend -> do nothing.
+	 * (2) is in others list -> move over.
+	 * (3) is non-existant -> create new one.
+	 */
 
 #ifdef CONN_DEBUG
-    std::cerr << "p3ConnectMgr::addFriend() " << id << "; gpg_id : " << gpg_id << std::endl;
+        std::cerr << "p3ConnectMgr::addFriend() " << id << "; gpg_id : " << gpg_id << std::endl;
 #endif
 
 #ifdef CONN_DEBUG
-    std::cerr << "p3ConnectMgr::addFriend() removing dummy friend" << std::endl;
+        std::cerr << "p3ConnectMgr::addFriend() removing dummy friend" << std::endl;
 #endif
-    //remove any dummy friend because we just add a real ssl friend
-    removeFriend("dummy"+ gpg_id);
+        //remove any dummy friend because we just add a real ssl friend
+        removeFriend("dummy"+ gpg_id);
 
-    {
-        RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
+	RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/
 
 
         std::map<std::string, peerConnectState>::iterator it;
@@ -2115,10 +2114,6 @@ bool p3ConnectMgr::addFriend(std::string id, std::string gpg_id, uint32_t netMod
 
 	IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
 
-    }
-        //usefull because we might add a friend by receiving an ssl connection, so we want the monitors to act right now
-        tickMonitors();
-
 	return true;
 }
 
diff --git a/libretroshare/src/pqi/pqihandler.cc b/libretroshare/src/pqi/pqihandler.cc
index 10fccde34..d917e122b 100644
--- a/libretroshare/src/pqi/pqihandler.cc
+++ b/libretroshare/src/pqi/pqihandler.cc
@@ -129,7 +129,7 @@ int	pqihandler::status()
 
 bool	pqihandler::AddSearchModule(SearchModule *mod)
 {
-        //RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/ This might be dangerous, but usefull for accepting new frinds right upon connection
+	RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
 	// if peerid used -> error.
 	std::map<std::string, SearchModule *>::iterator it;
 	if (mod->peerid != mod->pqi->PeerId())
diff --git a/libretroshare/src/pqi/pqipersongrp.cc b/libretroshare/src/pqi/pqipersongrp.cc
index 5d876b029..cb9ddf599 100644
--- a/libretroshare/src/pqi/pqipersongrp.cc
+++ b/libretroshare/src/pqi/pqipersongrp.cc
@@ -314,7 +314,7 @@ int     pqipersongrp::addPeer(std::string id)
 #endif
 
 	SearchModule *sm = NULL;
-  { //RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/ This might be dangerous, but usefull for accepting new frinds right upon connection
+  { RsStackMutex stack(coreMtx); /**************** LOCKED MUTEX ****************/
 	std::map<std::string, SearchModule *>::iterator it;
 	it = mods.find(id);
 	if (it != mods.end())