diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 94b114c03d8..418bca03d83 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
-			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
+			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index a52ddb5fbcc..c4f6b0a012c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -167,11 +167,7 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 		// Creation of payment line
 		$paiement = new Paiement($db);
 		$paiement->datepaye     = dol_now();
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-		$paiement->note_private = GETPOST('comment', 'alpha');
+		$paiement->amounts[]    = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
 
 		// Validating the attendee
 		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7ff74c31cb9..ff6da63be9a 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -172,22 +172,10 @@ if ($urllogo) {
 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
-// Output introduction text
-$text = '';
-if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
-	$langs->load("members");
-	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
-		$text .= $langs->trans($reg[1])."<br>\n";
-	} else {
-		$text .= $conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
-	}
-	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
-}
-if (empty($text)) {
-	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
-}
+$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
 print $text;
 
 // Output payment summary form
@@ -204,11 +192,17 @@ print "\n";
 
 // Show all action buttons
 print '<br>';
-print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
-print '<br><br>';
+// Output introduction text
+if($project->accept_conference_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+	print '<br><br>';
+}
 print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
-print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+if($project->accept_booth_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+}
+
 
 
 print '</td></tr>'."\n";