diff --git a/linphone-app/src/components/settings/AccountSettingsModel.cpp b/linphone-app/src/components/settings/AccountSettingsModel.cpp
index 953dc618d..72a5dd1fa 100644
--- a/linphone-app/src/components/settings/AccountSettingsModel.cpp
+++ b/linphone-app/src/components/settings/AccountSettingsModel.cpp
@@ -190,11 +190,13 @@ QVariantMap AccountSettingsModel::getAccountDescription (const shared_ptr<linpho
 		accountParamsUpdated->setNatPolicy(natPolicy);
 		account->setParams(accountParamsUpdated);
 	}
-	
-	shared_ptr<const linphone::AuthInfo> authInfo = CoreManager::getInstance()->getCore()->findAuthInfo(
+	if(turnUser != ""){
+		shared_ptr<const linphone::AuthInfo> authInfo = CoreManager::getInstance()->getCore()->findAuthInfo(
 				"", turnUser, stunServer
 				);
-	map["turnPassword"] = authInfo ? Utils::coreStringToAppString(authInfo->getPassword()) : QString("");
+		map["turnPassword"] = authInfo ? Utils::coreStringToAppString(authInfo->getPassword()) : QString("");
+	}else
+		map["turnPassword"] = "";
 	
 	return map;
 }
@@ -367,25 +369,27 @@ bool AccountSettingsModel::addOrUpdateAccount(
 	}
 	accountParams->setNatPolicy(natPolicy);// TODO : We don't have an API to know if the current nat policy have a ref or not, so reset the natPolicy in all case. When we can hjave this info, put the set in the previous if-block
 	
-	// Setting TURN auth info
-	shared_ptr<linphone::Core> core(CoreManager::getInstance()->getCore());
-	shared_ptr<const linphone::AuthInfo> authInfo(core->findAuthInfo("", turnUser, stunServer));
-	if (authInfo) {
-		shared_ptr<linphone::AuthInfo> clonedAuthInfo(authInfo->clone());
-		clonedAuthInfo->setUserid(turnUser);
-		clonedAuthInfo->setUsername(turnUser);
-		clonedAuthInfo->setPassword(Utils::appStringToCoreString(data["turnPassword"].toString()));
-		core->removeAuthInfo(authInfo);
-		core->addAuthInfo(clonedAuthInfo);
-	} else
-		core->addAuthInfo(linphone::Factory::get()->createAuthInfo(
-							  turnUser,
-							  turnUser,
-							  Utils::appStringToCoreString(data["turnPassword"].toString()),
-						  "",
-						  stunServer,
-						  ""
-    ));
+	if( turnUser != ""){
+		// Setting TURN auth info
+		shared_ptr<linphone::Core> core(CoreManager::getInstance()->getCore());
+		shared_ptr<const linphone::AuthInfo> authInfo(core->findAuthInfo("", turnUser, stunServer));
+		if (authInfo) {
+			shared_ptr<linphone::AuthInfo> clonedAuthInfo(authInfo->clone());
+			clonedAuthInfo->setUserid(turnUser);
+			clonedAuthInfo->setUsername(turnUser);
+			clonedAuthInfo->setPassword(Utils::appStringToCoreString(data["turnPassword"].toString()));
+			core->removeAuthInfo(authInfo);
+			core->addAuthInfo(clonedAuthInfo);
+		} else
+			core->addAuthInfo(linphone::Factory::get()->createAuthInfo(
+								  turnUser,
+								  turnUser,
+								  Utils::appStringToCoreString(data["turnPassword"].toString()),
+							  "",
+							  stunServer,
+							  ""
+		));
+	}
 	if( newPublishPresence)
 		emit publishPresenceChanged();
 	return addOrUpdateAccount(account, accountParams);