diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php
index d705c26831..b22c642c20 100644
--- a/app/conferences_active/app_languages.php
+++ b/app/conferences_active/app_languages.php
@@ -235,9 +235,14 @@
 	$text['label-member-count']['pt-pt'] = "Total de membros";
 	$text['label-member-count']['fr-fr'] = "Décompte des participants";
 
-	$text['button-view']['en-us'] = "view";
-	$text['button-view']['es-cl'] = "ver";
-	$text['button-view']['pt-pt'] = "vista";
+	$text['button-view']['en-us'] = "View";
+	$text['button-view']['es-cl'] = "Ver";
+	$text['button-view']['pt-pt'] = "Vista";
 	$text['button-view']['fr-fr'] = "Voir";
 
+	$text['label-participant-pin']['en-us'] = "Participant PIN";
+	$text['label-participant-pin']['es-cl'] = "Participante PIN";
+	$text['label-participant-pin']['pt-pt'] = "Participante PIN";
+	$text['label-participant-pin']['fr-fr'] = "Code Participant";
+
 ?>
diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php
index 3e9d026ce4..ba6caf4086 100644
--- a/app/conferences_active/conferences_active_inc.php
+++ b/app/conferences_active/conferences_active_inc.php
@@ -39,12 +39,11 @@ else {
 	$language = new text;
 	$text = $language->get();
 
-$tmp_conference_name = str_replace("_", " ", $conference_name);
 
 $switch_cmd = 'conference xml_list';
 $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 if (!$fp) {
-	$msg = "<div align='center'>".$text['message-connection']."<br /></div>"; 
+	$msg = "<div align='center'>".$text['message-connection']."<br /></div>";
 	echo "<div align='center'>\n";
 	echo "<table width='40%'>\n";
 	echo "<tr>\n";
@@ -72,6 +71,7 @@ else {
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "<th>".$text['label-name']."</th>\n";
+	echo "<th>".$text['label-participant-pin']."</th>\n";
 	echo "<th>".$text['label-member-count']."</th>\n";
 	echo "<th>&nbsp;</th>\n";
 	echo "</tr>\n";
@@ -83,45 +83,32 @@ else {
 		//show the conferences that have a matching domain
 			$tmp_domain = substr($name, -strlen($_SESSION['domain_name']));
 			if ($tmp_domain == $_SESSION['domain_name']) {
-				$conference_name = substr($name, 0, strlen($name) - strlen('-'.$_SESSION['domain_name']));
-
-				if (is_uuid($conference_name)) {
-					$sql = "select * from v_meetings ";
-					$sql .= "where meeting_uuid = '$conference_name'; ";
+				$meeting_uuid = substr($name, 0, strlen($name) - strlen('-'.$_SESSION['domain_name']));
+				if (is_uuid($meeting_uuid)) {
+					$sql = "select ";
+					$sql .= "cr.conference_room_name, ";
+					$sql .= "v.participant_pin ";
+					$sql .= "from ";
+					$sql .= "v_meetings as v, ";
+					$sql .= "v_conference_rooms as cr ";
+					$sql .= "where ";
+					$sql .= "v.meeting_uuid = cr.meeting_uuid ";
+					$sql .= "and v.meeting_uuid = '".$meeting_uuid."' ";
 					$prep_statement = $db->prepare(check_sql($sql));
 					$prep_statement->execute();
 					$result = $prep_statement->fetchAll();
-					foreach ($result as &$row) {
-						$moderator_pin = $row["moderator_pin"];
-						$participant_pin = $row["participant_pin"];
-						if (strlen($conference_name) > 0) {
-							$conference_name = $row["description"];
-						}
-						else {
-							$conference_name = $row["participant_pin"];
-						}
+					foreach ($result as $row2) {
+						$conference_room_name = $row2['conference_room_name'];
+						$participant_pin = $row2['participant_pin'];
 					}
 					unset ($prep_statement);
 				}
 
-				$conference_display_name = str_replace("-", " ", $conference_name);
-				$conference_display_name = str_replace("_", " ", $conference_display_name);
-
-				//$id = $row->members->member->id;
-				//$flag_can_hear = $row->members->member->flags->can_hear;
-				//$flag_can_speak = $row->members->member->flags->can_speak;
-				//$flag_talking = $row->members->member->flags->talking;
-				//$flag_has_video = $row->members->member->flags->has_video;
-				//$flag_has_floor = $row->members->member->flags->has_floor;
-				//$uuid = $row->members->member->uuid;
-				//$caller_id_name = $row->members->member->caller_id_name;
-				//$caller_id_name = str_replace("%20", " ", $caller_id_name);
-				//$caller_id_number = $row->members->member->caller_id_number;
-
 				echo "<tr>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'>".$conference_display_name."</td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'><a href='conference_interactive.php?c=".$meeting_uuid."'>".$conference_room_name."</a></td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'>".$participant_pin."</td>\n";
 				echo "<td valign='top' class='".$row_style[$c]."'>".$member_count."</td>\n";
-				echo "<td valign='top' class='".$row_style[$c]."'><a href='conference_interactive.php?c=".$conference_name."'>".$text['button-view']."</a></td>\n";
+				echo "<td valign='top' class='".$row_style[$c]."'><a href='conference_interactive.php?c=".$meeting_uuid."'>".$text['button-view']."</a></td>\n";
 				echo "</tr>\n";
 
 				if ($c==0) { $c=1; } else { $c=0; }