diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0672f62d9..26a69c366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Crash when editing contacts from chat.
 - Contacts synchronization on creation.
 - Contact menu in secure chats.
+- Remove FFMPEG from dependencies as it is no mmore needed.
 
 ## 5.0.9 - 2023-01-31
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d92707c5..236f8dc29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ option(ENABLE_BUILD_APP_PLUGINS "Enable the build of plugins" YES)
 option(ENABLE_BUILD_EXAMPLES "Enable the build of examples" NO)
 option(ENABLE_BUILD_VERBOSE "Enable the build generation to be more verbose" NO)
 option(ENABLE_DAEMON "Enable the linphone daemon interface." NO)
-option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." ON)
+option(ENABLE_FFMPEG "Build mediastreamer2 with ffmpeg video support." NO)# No more needed
 option(ENABLE_QT_KEYCHAIN "Build QtKeychain to manage VFS from System key stores." ON)
 option(ENABLE_QRCODE "Enable QRCode support" NO)#Experimental
 option(ENABLE_SANITIZER "Enable sanitizer." NO)
@@ -149,7 +149,11 @@ list(APPEND APP_OPTIONS "-DENABLE_BUILD_VERBOSE=${ENABLE_BUILD_VERBOSE}")
 list(APPEND APP_OPTIONS "-DENABLE_CONSOLE_UI=${ENABLE_CONSOLE_UI}")
 list(APPEND APP_OPTIONS "-DENABLE_DAEMON=${ENABLE_DAEMON}")
 list(APPEND APP_OPTIONS "-DENABLE_FFMPEG=${ENABLE_FFMPEG}")
-list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=${ENABLE_QRCODE}")
+if(ENABLE_UNIT_TESTS)
+	list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=ON")
+else()
+	list(APPEND APP_OPTIONS "-DENABLE_FLEXIAPI=${ENABLE_QRCODE}")
+endif()
 list(APPEND APP_OPTIONS "-DENABLE_LDAP=${ENABLE_LDAP}")
 list(APPEND APP_OPTIONS "-DENABLE_NON_FREE_CODECS=${ENABLE_NON_FREE_CODECS}")
 list(APPEND APP_OPTIONS "-DENABLE_OPENH264=${ENABLE_OPENH264}")
diff --git a/README.md b/README.md
index b3ffd5640..a5dc1fd38 100644
--- a/README.md
+++ b/README.md
@@ -236,7 +236,7 @@ Also, more configurations are available in the docker-files folder of linphone-s
 | ENABLE_VIDEO | Enable Video support. | YES |
 | ENABLE_OPENH264 | Enable the use of OpenH264 codec | YES |
 | ENABLE_NON_FREE_CODECS | Enable the use of non free codecs | YES |
-| ENABLE_FFMPEG | Build mediastreamer2 with ffmpeg video support. | ON |
+| ENABLE_FFMPEG | Build mediastreamer2 with ffmpeg video support. | NO |
 | ENABLE_CONSOLE_UI | Turn on or off compilation of console interface. | NO |
 -->
 
diff --git a/linphone-app/src/components/ldap/LdapModel.cpp b/linphone-app/src/components/ldap/LdapModel.cpp
index 4eb53244c..15f524cc1 100644
--- a/linphone-app/src/components/ldap/LdapModel.cpp
+++ b/linphone-app/src/components/ldap/LdapModel.cpp
@@ -114,8 +114,6 @@ void LdapModel::set(){
 	mLdapParams->setSipDomain(mSipDomain.toStdString());
 	mLdapParams->setDebugLevel( (linphone::LdapDebugLevel) mDebug);
 	mLdapParams->setServerCertificatesVerificationMode((linphone::LdapCertVerificationMode)mVerifyServerCertificates);
-	static int gCount = 0;
-	mLdapParams->setAuthMethod((++gCount % 2) == 0 ? linphone::LdapAuthMethod::Anonymous : linphone::LdapAuthMethod::Simple);
 }
 
 void LdapModel::unset(){