diff --git a/pages/account/32.php b/pages/account/32.php
index 12d5cf1..3695a4e 100644
--- a/pages/account/32.php
+++ b/pages/account/32.php
@@ -13,12 +13,12 @@
     PARTICULAR PURPOSE.  See the License for more details.
 */ ?>
 <?
-	$query = "select * from `orginfo` where `id`='".$_SESSION[_config][orgid]."'";
+	$query = "select * from `orginfo` where `id`='".$_SESSION['_config']['orgid']."'";
 	$row = mysql_fetch_assoc(mysql_query($query));
 ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="500">
   <tr>
-    <td colspan="5" class="title"><? printf(_("%s's Administrators"), $row[O]); ?> (<a href="account.php?id=33"><?=_("Add")?></a>)</td>
+    <td colspan="5" class="title"><? printf(_("%s's Administrators"), $row['O']); ?> (<a href="account.php?id=33"><?=_("Add")?></a>)</td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Administrator")?></td>
@@ -28,19 +28,19 @@
     <td class="DataTD"><?=_("Delete")?></td>
   </tr>
 <?
-	$query = "select * from `org` where `orgid`='".$_SESSION[_config][orgid]."'";
+	$query = "select * from `org` where `orgid`='".$_SESSION['_config']['orgid']."'";
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{
-		$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[memid]'"));
+		$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='${row['memid']}'"));
 ?>
   <tr>
-    <td class="DataTD"><?=$user[fname]?> <?=$user[lname]?></a></td>
-    <td class="DataTD"><?=$row[masteracc]?></a></td>
-    <td class="DataTD"><?=$row[OU]?></a></td>
-    <td class="DataTD"><?=$row[comments]?></a></td>
+    <td class="DataTD"><a href='mailto:<?=$user['email']?>'><?=$user['fname']?> <?=$user['lname']?></a></td>
+    <td class="DataTD"><?=$row['masteracc']?></a></td>
+    <td class="DataTD"><?=$row['OU']?></a></td>
+    <td class="DataTD"><?=$row['comments']?></a></td>
 <? if($row[masteracc] == 0 || $_SESSION['profile']['admin'] == 1) { ?>
-    <td class="DataTD"><a href="account.php?id=34&orgid=<?=$_SESSION[_config][orgid]?>&memid=<?=$row[memid]?>"><?=_("Delete")?></a></td>
+    <td class="DataTD"><a href="account.php?id=34&orgid=<?=$_SESSION['_config']['orgid']?>&memid=<?=$row['memid']?>"><?=_("Delete")?></a></td>
 <? } else { ?>
     <td class="DataTD">N/A</td>
 <? } ?>