diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 0f0027b663d..db7654dc703 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -495,12 +495,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	global $dolibarr_main_url_root;
 	
-	$keyforid = 'DV3PH';
-	$encodedid = dol_encode($id, $keyforid);
+	$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
 	
-	$keyforsecurekey = 'CGLOO';
-	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$id, $keyforsecurekey);
+	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
 	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 	
 	$object->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 0250229e269..558bcb23d21 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -79,17 +79,15 @@ $email = GETPOST("email");
 
 // Getting id from Post and decoding it
 $encodedid = GETPOST('id');
-$keyforid = 'DV3PH';
-$id = dol_decode($encodedid, $keyforid);
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
-$keyforsecurekey = 'CGLOO';
-$securekeyandid = dol_decode($encodedsecurekeyandid, $keyforsecurekey);
+$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
 
 // Securekey decomposition into pure securekey and id added at the end
-$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($id));
-$idgotfromsecurekey = substr($securekeyandid, -strlen($id), strlen($id));
+$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
+$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)),$dolibarr_main_instance_unique_id);
 
 // We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
 if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {