diff --git a/pages/account/16.php b/pages/account/16.php
index 9289370..3e582e3 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -38,11 +38,11 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Name")?>:</td>
-    <td class="DataTD"><input type="text" name="name" value="<?=array_key_exists('name',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['name']):''?>"></td>
+    <td class="DataTD"><input type="text" name="name" value="<?=array_key_exists('name',$_SESSION['_config'])?($_SESSION['_config']['name']):''?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Department")?>:</td>
-    <td class="DataTD"><input type="text" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['OU']):''?>"></td>
+    <td class="DataTD"><input type="text" name="OU" value="<?=array_key_exists('OU',$_SESSION['_config'])?($_SESSION['_config']['OU']):''?>"></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2" align="left">
diff --git a/pages/account/21.php b/pages/account/21.php
index c0fee70..3f656e1 100644
--- a/pages/account/21.php
+++ b/pages/account/21.php
@@ -34,7 +34,7 @@
 <?=_("subjectAltName")?>: <?=$row?><br>
 <? } ?>
 <?=_("Organisation")?>: <?=$org['O']?><br>
-<?=_("Org. Unit")?>: <?=sanitizeHTML($_SESSION['_config']['OU'])?><br>
+<?=_("Org. Unit")?>: <?=($_SESSION['_config']['OU'])?><br>
 <?=_("Location")?>: <?=$org['L']?><br>
 <?=_("State/Province")?>: <?=$org['ST']?><br>
 <?=_("Country")?>: <?=$org['C']?><br>
diff --git a/pages/account/24.php b/pages/account/24.php
index 190a046..3c10800 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -22,19 +22,19 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Organisation Name")?>:</td>
-    <td class="DataTD"><input type="text" name="O" value="<?=sanitizeHTML($_SESSION['_config']['O'])?>"></td>
+    <td class="DataTD"><input type="text" name="O" value="<?=($_SESSION['_config']['O'])?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Contact Email")?>:</td>
-    <td class="DataTD"><input type="text" name="contact" value="<?=sanitizeHTML($_SESSION['_config']['contact'])?>"></td>
+    <td class="DataTD"><input type="text" name="contact" value="<?=($_SESSION['_config']['contact'])?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Town/Suburb")?>:</td>
-    <td class="DataTD"><input type="text" name="L" value="<?=sanitizeHTML($_SESSION['_config']['L'])?>"></td>
+    <td class="DataTD"><input type="text" name="L" value="<?=($_SESSION['_config']['L'])?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("State/Province")?>:</td>
-    <td class="DataTD"><input type="text" name="ST" value="<?=sanitizeHTML($_SESSION['_config']['ST'])?>"></td>
+    <td class="DataTD"><input type="text" name="ST" value="<?=($_SESSION['_config']['ST'])?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
@@ -42,7 +42,7 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-    <td class="DataTD"><textarea name="comments" cols=15 rows=5><?=sanitizeHTML($_SESSION['_config']['comments'])?></textarea></td>
+    <td class="DataTD"><textarea name="comments" cols=15 rows=5><?=($_SESSION['_config']['comments'])?></textarea></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
diff --git a/pages/account/28.php b/pages/account/28.php
index 87e1ee8..78f279c 100644
--- a/pages/account/28.php
+++ b/pages/account/28.php
@@ -22,7 +22,7 @@
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("New Domain for %s"), sanitizeHTML($row['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("New Domain for %s"), ($row['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Domain")?>:</td>
diff --git a/pages/account/29.php b/pages/account/29.php
index e5ce4fb..c1a3def 100644
--- a/pages/account/29.php
+++ b/pages/account/29.php
@@ -28,7 +28,7 @@
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Update Domain for %s"), sanitizeHTML($org['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("Update Domain for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Domain")?>:</td>
diff --git a/pages/account/30.php b/pages/account/30.php
index 9941247..30c86f3 100644
--- a/pages/account/30.php
+++ b/pages/account/30.php
@@ -28,7 +28,7 @@
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Domain for %s"), sanitizeHTML($org['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("Delete Domain for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this domain?"), sanitizeHTML($row['domain'])); ?></td>
diff --git a/pages/account/31.php b/pages/account/31.php
index 4247582..f09b49b 100644
--- a/pages/account/31.php
+++ b/pages/account/31.php
@@ -24,7 +24,7 @@
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Organisation"), sanitizeHTML($org['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("Delete Organisation"), ($org['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s and all certificates issued under this organisation?"), sanitizeHTML($row['O'])); ?></td>
diff --git a/pages/account/33.php b/pages/account/33.php
index 935b527..be42470 100644
--- a/pages/account/33.php
+++ b/pages/account/33.php
@@ -23,7 +23,7 @@
 <input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("New Admin for %s"), sanitizeHTML($row['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("New Admin for %s"), ($row['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Email")?>:</td>
@@ -31,7 +31,7 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Department")?>:</td>
-    <td class="DataTD"><input type="text" name="OU" value="<?=sanitizeHTML($_SESSION['_config']['OU'])?>"></td>
+    <td class="DataTD"><input type="text" name="OU" value="<?=($_SESSION['_config']['OU'])?>"></td>
   </tr>
 <? if($_SESSION['profile']['orgadmin'] == 1) { ?>
   <tr>
@@ -44,7 +44,7 @@
 <? } ?>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-    <td class="DataTD"><input type="text" name="comments" value="<?=sanitizeHTML($_SESSION['_config']['comments'])?>"></td>
+    <td class="DataTD"><input type="text" name="comments" value="<?=($_SESSION['_config']['comments'])?>"></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td>
diff --git a/pages/account/34.php b/pages/account/34.php
index 73088ba..25ad1db 100644
--- a/pages/account/34.php
+++ b/pages/account/34.php
@@ -29,7 +29,7 @@
 <input type="hidden" name="memid" value="<?=intval($_REQUEST['memid'])?>">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="2" class="title"><? printf(_("Delete Admin for %s"), sanitizeHTML($org['O'])); ?></td>
+    <td colspan="2" class="title"><? printf(_("Delete Admin for %s"), ($org['O'])); ?></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><? printf(_("Are you really sure you want to remove %s from administering this organisation?"), sanitizeHTML($user['fname'])." ".sanitizeHTML($user['lname'])); ?></td>
diff --git a/pages/account/35.php b/pages/account/35.php
index fbf8fee..3a4714f 100644
--- a/pages/account/35.php
+++ b/pages/account/35.php
@@ -39,7 +39,7 @@
 ?>
   <tr>
     <td class="DataTD"><?=intval($row['id'])?></td>
-    <td class="DataTD"><?=sanitizeHTML($row['O'])?>, <?=sanitizeHTML($row['ST'])?> <?=sanitizeHTML($row['C'])?></td>
+    <td class="DataTD"><?=($row['O'])?>, <?=($row['ST'])?> <?=sanitizeHTML($row['C'])?></td>
     <td class="DataTD"><a href="account.php?id=32&amp;orgid=<?=$row['id']?>"><?=_("Admins")?> (<?=$admincount?>)</a></td>
   </tr>
 <?
diff --git a/pages/account/54.php b/pages/account/54.php
index 4e3b7fe..f27bc5a 100644
--- a/pages/account/54.php
+++ b/pages/account/54.php
@@ -148,7 +148,7 @@
 ?>
   <tr>
     <td class="DataTD"><?=$row['name']?></td>
-    <td class="DataTD"><a href="account.php?id=54&amp;locid=<?=$locid?>&amp;name=<?=sanitizeHTML($row['name'])?>&amp;action=delalias" onclick="return confirm('Are you sure you want to delete this location alias?');"><?=_("Delete")?></td>
+    <td class="DataTD"><a href="account.php?id=54&amp;locid=<?=$locid?>&amp;name=<?=($row['name'])?>&amp;action=delalias" onclick="return confirm('Are you sure you want to delete this location alias?');"><?=_("Delete")?></td>
   </tr>
 <? } ?>
 </table>