diff --git a/pages/account/19.php b/pages/account/19.php
index 9ad474d..1f2264f 100644
--- a/pages/account/19.php
+++ b/pages/account/19.php
@@ -33,9 +33,9 @@
         $crtname=escapeshellarg($row['crt_name']);
 	$cert = `/usr/bin/openssl x509 -in $crtname`;
 
-	if($row[keytype] == "NS")
+	if($row['keytype'] == "NS")
 	{
-		if($install == 1)
+		if(array_key_exists('install',$_REQUEST) && $_REQUEST['install'] == 1)
 		{
 			header("Content-Type: application/x-x509-user-cert");
 			header("Content-Length: ".strlen($cert));
diff --git a/pages/account/24.php b/pages/account/24.php
index 3c10800..e9b122c 100644
--- a/pages/account/24.php
+++ b/pages/account/24.php
@@ -22,27 +22,27 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("Organisation Name")?>:</td>
-    <td class="DataTD"><input type="text" name="O" value="<?=($_SESSION['_config']['O'])?>"></td>
+    <td class="DataTD"><input type="text" name="O" value="<?=array_key_exists('O',$_SESSION['_config'])?$_SESSION['_config']['O']:""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Contact Email")?>:</td>
-    <td class="DataTD"><input type="text" name="contact" value="<?=($_SESSION['_config']['contact'])?>"></td>
+    <td class="DataTD"><input type="text" name="contact" value="<?=array_key_exists('contact',$_SESSION['_config'])?$_SESSION['_config']['contact']:""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Town/Suburb")?>:</td>
-    <td class="DataTD"><input type="text" name="L" value="<?=($_SESSION['_config']['L'])?>"></td>
+    <td class="DataTD"><input type="text" name="L" value="<?=array_key_exists('L',$_SESSION['_config'])?$_SESSION['_config']['L']:""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("State/Province")?>:</td>
-    <td class="DataTD"><input type="text" name="ST" value="<?=($_SESSION['_config']['ST'])?>"></td>
+    <td class="DataTD"><input type="text" name="ST" value="<?=array_key_exists('ST',$_SESSION['_config'])?$_SESSION['_config']['ST']:""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Country")?>:</td>
-    <td class="DataTD"><input type="text" name="C" value="<?=sanitizeHTML($_SESSION['_config']['C'])?>"></td>
+    <td class="DataTD"><input type="text" name="C" value="<?=array_key_exists('C',$_SESSION['_config'])?sanitizeHTML($_SESSION['_config']['C']):""?>"></td>
   </tr>
   <tr>
     <td class="DataTD"><?=_("Comments")?>:</td>
-    <td class="DataTD"><textarea name="comments" cols=15 rows=5><?=($_SESSION['_config']['comments'])?></textarea></td>
+    <td class="DataTD"><textarea name="comments" cols="15" rows="5"><?=array_key_exists('comments',$_SESSION['_config'])?$_SESSION['_config']['comments']:""?></textarea></td>
   </tr>
   <tr>
     <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>