diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 23818d4aa9d..8ff51305e08 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -414,7 +414,7 @@ class Account extends CommonObject
         {
             $sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
             $sql.= " WHERE id=".$oper;
-            $sql.= " AND entity = " . getEntity('c_paiement') . ")";
+            $sql.= " AND entity IN (" . getEntity('c_paiement') . ")";
             $resql=$this->db->query($sql);
             if ($resql)
             {
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index bd262eaa675..398f70ad36a 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -60,18 +60,21 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm=='yes
 
 	if (! $_POST["paiementtype"] > 0)
 	{
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
+		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
+        $action = 'create';
 	}
 	if ($datepaye == '')
 	{
-		$mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date"));
+		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")), null, 'errors');
 		$error++;
+        $action = 'create';
 	}
     if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0)
     {
-        $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit"));
+        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")), null, 'errors');
         $error++;
+        $action = 'create';
     }
 
 	if (! $error)
@@ -91,7 +94,8 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm=='yes
         if (count($amounts) <= 0)
         {
             $error++;
-            $errmsg='ErrorNoPaymentDefined';
+            setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
+            $action='create';
         }
 
         if (! $error)
@@ -112,18 +116,20 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm=='yes
     		    $paymentid = $paiement->create($user, (GETPOST('closepaidcontrib')=='on'?1:0));
                 if ($paymentid < 0)
                 {
-                    $errmsg=$paiement->error;
-                    $error++;
+                	$error++;
+                	setEventMessages($paiement->error, null, 'errors');
+                	$action='create';
                 }
     		}
 
             if (! $error)
             {
-                $result=$paiement->addPaymentToBank($user,'payment_sc','(SocialContributionPayment)',$_POST['accountid'],'','');
-                if (! $result > 0)
+                $result=$paiement->addPaymentToBank($user,'payment_sc','(SocialContributionPayment)', GETPOST('accountid','int'),'','');
+                if (! ($result > 0))
                 {
-                    $errmsg=$paiement->error;
-                    $error++;
+                	$error++;
+                	setEventMessages($paiement->error, null, 'errors');
+                	$action='create';
                 }
             }
 
@@ -141,7 +147,6 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm=='yes
         }
 	}
 
-	$_GET["action"]='create';
 }
 
 
@@ -266,7 +271,7 @@ if ($action == 'create')
 	{
 		$objp = $charge;
 
-		
+
 
 		print '<tr class="oddeven">';
 
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index da1b0a35bdf..ea9bc5af42a 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -159,8 +159,7 @@ if ($action == 'valide')
 }
 
 
-//$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/index.php">' . $langs->trans("BackToList") . '</a>';
-$linkback = '';
+$linkback = '<a href="' . DOL_URL_ROOT . '/compta/sociales/payments.php">' . $langs->trans("BackToList") . '</a>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');