diff --git a/libretroshare/src/retroshare/rspeers.h b/libretroshare/src/retroshare/rspeers.h
index db3cbca85..b0cf0a7de 100644
--- a/libretroshare/src/retroshare/rspeers.h
+++ b/libretroshare/src/retroshare/rspeers.h
@@ -426,9 +426,16 @@ public:
 	 * @param[in] sslId id of the peer to check
 	 * @return true if the node is trusted, false otherwise
 	 */
-	virtual bool isFriend(const RsPeerId &sslId) = 0;
+	virtual bool isFriend(const RsPeerId& sslId) = 0;
+
+	/**
+	 * @brief Check if given PGP id is trusted
+	 * @jsonapi{development}
+	 * @param[in] pgpId PGP id to check
+	 * @return true if the PGP id is trusted, false otherwise
+	 */
+	virtual bool isPgpFriend(const RsPgpId& pgpId) = 0;
 
-	virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend) = 0;
 	virtual std::string getPeerName(const RsPeerId &ssl_id) = 0;
 	virtual std::string getGPGName(const RsPgpId& gpg_id) = 0;
 
@@ -731,6 +738,9 @@ public:
     	virtual bool setPeerMaximumRates(const RsPgpId& pid,uint32_t maxUploadRate,uint32_t maxDownloadRate) =0;
     	virtual bool getPeerMaximumRates(const RsPeerId& pid,uint32_t& maxUploadRate,uint32_t& maxDownloadRate) =0;
     	virtual bool getPeerMaximumRates(const RsPgpId& pid,uint32_t& maxUploadRate,uint32_t& maxDownloadRate) =0;
+
+	RS_DEPRECATED_FOR(isPgpFriend)
+	virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend) = 0;
 };
 
 
diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
index 8c9c29c8a..02365d7bf 100644
--- a/libretroshare/src/rsserver/p3peers.cc
+++ b/libretroshare/src/rsserver/p3peers.cc
@@ -567,11 +567,11 @@ std::string p3Peers::getGPGName(const RsPgpId &gpg_id)
         return AuthGPG::getAuthGPG()->getGPGName(gpg_id);
 }
 
+bool p3Peers::isPgpFriend(const RsPgpId& pgpId)
+{ return AuthGPG::getAuthGPG()->isGPGAccepted(pgpId); }
+
 bool p3Peers::isGPGAccepted(const RsPgpId &gpg_id_is_friend)
-{
-        /* get from mAuthMgr as it should have more peers? */
-        return AuthGPG::getAuthGPG()->isGPGAccepted(gpg_id_is_friend);
-}
+{ return isPgpFriend(gpg_id_is_friend); }
 
 std::string p3Peers::getPeerName(const RsPeerId& ssl)
 {
diff --git a/libretroshare/src/rsserver/p3peers.h b/libretroshare/src/rsserver/p3peers.h
index f5f61a43e..02389128f 100644
--- a/libretroshare/src/rsserver/p3peers.h
+++ b/libretroshare/src/rsserver/p3peers.h
@@ -66,7 +66,11 @@ public:
 
 	virtual bool isOnline(const RsPeerId &id);
 	virtual bool isFriend(const RsPeerId &id);
+	virtual bool isPgpFriend(const RsPgpId& pgpId);
+
+	RS_DEPRECATED_FOR(isPgpFriend)
 	virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend);
+
 	virtual std::string getGPGName(const RsPgpId &gpg_id);
 	virtual std::string getPeerName(const RsPeerId& ssl_or_gpg_id);
 	virtual bool getPeerDetails(const RsPeerId& ssl_or_gpg_id, RsPeerDetails &d);