diff --git a/ChangeLog b/ChangeLog
index a1eeb18a5..583606f01 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-06-19 Robin Johnson  <robbat2@users.sourceforge.net>
+    * libraries/charset_conversion.lib.php3, 
+      libraries/common.lib.php3,
+      main.php3
+        - added isset() before some configuration variables
+
 2002-06-18 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/chinese* updates, thanks to Siu Sun
     * lang/lithuanian updates, thanks to Vilius Zigmantas
diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3
index 4fcda682a..a61016a4c 100644
--- a/libraries/charset_conversion.lib.php3
+++ b/libraries/charset_conversion.lib.php3
@@ -13,10 +13,12 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
     /**
      * Loads the recode or iconv extensions if any of it is not loaded yet
      */
-    if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && 
-        ((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
+    if ( isset($cfg['AllowAnywhereRecoding']) 
+         && $cfg['AllowAnywhereRecoding'] 
+         && $allow_recoding 
+         && ((PMA_PHP_INT_VERSION >= 40000 && !@ini_get('safe_mode') && @ini_get('enable_dl'))
          || (PMA_PHP_INT_VERSION > 30009 && !@get_cfg_var('safe_mode')))
-        && @function_exists('dl')) {
+         && @function_exists('dl')) {
         if (!(@extension_loaded('recode')||@extension_loaded('iconv'))) {
             if (PMA_IS_WINDOWS) {
                 $suffix = '.dll';
@@ -48,7 +50,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
      */
      function PMA_convert_display_charset($what) {
          global $cfg, $allow_recoding, $charset, $convcharset;
-         if (!($cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
+         if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
              return $what;
          } else {
              if (is_array($what)) {
@@ -112,7 +114,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
      */
      function PMA_convert_charset($what) {
          global $cfg, $allow_recoding, $charset, $convcharset;
-         if (!($cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
+         if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
             return $what;
          } else {
              if (@function_exists('iconv')) {
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index d6e771c39..2fdd07118 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -583,7 +583,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
         // Look at: "static int check_dir_access(request_rec *r)"
         // Robbat2 - May 10, 2002
-        if ($cfg['Server']['AllowDeny']['order']) {
+        if (isset($cfg['Server']['AllowDeny']) && $cfg['Server']['AllowDeny']['order']) {
             include('./libraries/ip_allow_deny.lib.php3');
 
             $allowDeny_forbidden         = FALSE; //default
diff --git a/main.php3 b/main.php3
index a4fd9fd30..851d3e5eb 100755
--- a/main.php3
+++ b/main.php3
@@ -487,7 +487,7 @@ if (empty($cfg['Lang'])) {
 echo "\n";
 ?>
 <?php
-if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
+if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding) {
 ?>
         <!-- Charset Selection -->
         <tr>