diff --git a/Linphone/model/address-books/ldap/LdapModel.cpp b/Linphone/model/address-books/ldap/LdapModel.cpp
index 346d73623..fb283634f 100644
--- a/Linphone/model/address-books/ldap/LdapModel.cpp
+++ b/Linphone/model/address-books/ldap/LdapModel.cpp
@@ -33,6 +33,7 @@ LdapModel::LdapModel(const std::shared_ptr<linphone::RemoteContactDirectory> &ld
 		mLdapParamsClone = CoreModel::getInstance()->getCore()->createLdapParams();
 		mLdapParamsClone->setDelay(2000);
 		mLdapParamsClone->enableTls(true);
+		mLdapParamsClone->setEnabled(true);
 
 		mLdap = CoreModel::getInstance()->getCore()->createLdapRemoteContactDirectory(mLdapParamsClone);
 		mLdap->setTimeout(5);
diff --git a/Linphone/model/tool/ToolModel.cpp b/Linphone/model/tool/ToolModel.cpp
index 0293ccb60..475cd529e 100644
--- a/Linphone/model/tool/ToolModel.cpp
+++ b/Linphone/model/tool/ToolModel.cpp
@@ -84,7 +84,7 @@ std::shared_ptr<linphone::AudioDevice> ToolModel::findAudioDevice(const QString
 QString ToolModel::getDisplayName(const std::shared_ptr<linphone::Address> &address) {
 	QString displayName;
 	if (address) {
-		auto linFriend = ToolModel::findFriendByAddress(address);
+		auto linFriend = findFriendByAddress(address);
 		if (linFriend) {
 			if (displayName.isEmpty()) displayName = Utils::coreStringToAppString(linFriend->getName());
 		}
@@ -228,7 +228,8 @@ std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(const QString &
 	else return nullptr;
 }
 
-std::shared_ptr<linphone::Friend> ToolModel::findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr) {
+std::shared_ptr<linphone::Friend>
+ToolModel::findFriendByAddress(const std::shared_ptr<linphone::Address> &linphoneAddr) {
 	auto friendsManager = FriendsManager::getInstance();
 	linphoneAddr->clean();
 	QString key = Utils::coreStringToAppString(linphoneAddr->asStringUriOnly());
diff --git a/Linphone/model/tool/ToolModel.hpp b/Linphone/model/tool/ToolModel.hpp
index 43972f923..919584a50 100644
--- a/Linphone/model/tool/ToolModel.hpp
+++ b/Linphone/model/tool/ToolModel.hpp
@@ -55,7 +55,8 @@ public:
 	                                         std::shared_ptr<linphone::ChatRoom> chatRoom);
 
 	static std::shared_ptr<linphone::Friend> findFriendByAddress(const QString &address);
-	static std::shared_ptr<linphone::Friend> findFriendByAddress(std::shared_ptr<linphone::Address> linphoneAddr);
+	static std::shared_ptr<linphone::Friend>
+	findFriendByAddress(const std::shared_ptr<linphone::Address> &linphoneAddr);
 
 	static bool createCall(const QString &sipAddress,
 	                       const QVariantMap &options = {},