diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index a32805b6169fa8d8d5f08d49e91f59f517659c05..dc73c70b4ba8d2f2e26c37c0c3679befcbb35429 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -106,6 +106,7 @@ function checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmod
     				sleep(1);
     				$langs->load('main');
     				$langs->load('other');
+    				$langs->load('errors');
     				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorFailedToLoadLoginFileForMode",$mode);
     			}
     		}
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index acbb0e286b9e15f273c9ae78ca230252449152a2..0462b4d1dc99b93661239fb02b25eba3df6bae1d 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -174,6 +174,7 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index a008821e138f59fb460c48e8864e0e5fe8faf74a..881fa0b95f8ea06b78f634829dcfc5ad71b9a7d3 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -104,7 +104,7 @@ if (empty($reshook))
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
 	    $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
-	    	  
+
 	    // We must define tva_tx, npr and local taxes
 	    $vatratecode = '';
 	    $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index f439e791cb44f1b6675d8f1727cf431fccb5eb49..8a12c288d559e39b0e7d34c5c180610920cc1966 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -660,7 +660,7 @@ function updateContact($authentication,$contact)
 			$object->civility_id=$contact['civility_id'];
 			$object->poste=$contact['poste'];
 
-			$object->statut=$contact['statut'];
+			$object->statut=$contact['status'];
 
 
 			//Retreive all extrafield for contact
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 28518d24763da0496da8360625b504d5e04b976e..de72af93b615b169d922aa81c0b499b2afe0700b 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -935,7 +935,7 @@ function updateOrder($authentication,$order)
 			if (isset($order['billed']))
 			{
 				if ($order['billed'])   $result=$object->classifyBilled($fuser);
-				if (! $order['billed']) $result=$object->classifyBilled($fuser);
+				if (! $order['billed']) $result=$object->classifyUnBilled($fuser);
 			}
 
 			//Retreive all extrafield for object