diff --git a/pages/account/43.php b/pages/account/43.php
index a942f18..53b24d3 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -504,7 +504,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<td class="DataTD"><?=_("Revoked")?></td>
 		<td class="DataTD"><?=_("Latest Expire")?></td>
 	</tr>
-
+<!-- server certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Server")?>:</td>
 	<?
@@ -564,7 +564,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-
+<!-- client certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Client")?>:</td>
 	<?
@@ -619,7 +619,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-
+<!-- gpg certificates -->
 	<tr>
 		<td class="DataTD"><?=_("GPG")?>:</td>
 	<?
@@ -645,9 +645,9 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		$valid = $drow['valid'];
 
 		$query = "select COUNT(*) as `expired`
-		          from `emailcerts`
-		          where `memid` = '".intval($row['id'])."'
-		                and `expire` <= NOW()";
+			from `gpg`
+			where `memid` = '".intval($row['id'])."'
+			and `expire` <= NOW()";
 		$dres = mysql_query($query);
 		$drow = mysql_fetch_assoc($dres);
 		$expired = $drow['expired'];
@@ -666,7 +666,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-
+<!-- org server certificates -->
 	<tr>
 		<td class="DataTD"><a href="account.php?id=58&amp;userid=<?=intval($row['id'])?>"><?=_("Org Server")?></a>:</td>
 	<?
@@ -726,7 +726,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
 		<?
 	} ?>
 	</tr>
-
+<!-- org client certificates -->
 	<tr>
 		<td class="DataTD"><?=_("Org Client")?>:</td>
 	<?