diff --git a/config.php b/config.php
index eb8e86cc3..7870b3354 100644
--- a/config.php
+++ b/config.php
@@ -57,9 +57,18 @@ define('G4_SYNDI_DIR',      'syndi');
 if (G4_DOMAIN) {
     define('G4_URL', G4_DOMAIN);
 } else {
-    define('G4_URL', $g4_path['url']);
+    if (isset($g4_path['url'])) {
+        define('G4_URL', $g4_path['url']);
+    } else {
+        define('G4_URL', '');
+    }
+}
+
+if (isset($g4_path['path'])) {
+    define('G4_PATH', $g4_path['path']);
+} else {
+    define('G4_PATH', '');
 }
-define('G4_PATH', $g4_path['path']);
 
 define('G4_ADMIN_URL',      G4_URL.'/'.G4_ADMIN_DIR);
 define('G4_BBS_URL',        G4_URL.'/'.G4_BBS_DIR);
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 2cc4c0874..1ac098608 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1987,8 +1987,9 @@ function hyphen_hp_number($hp)
 function login_url($url='')
 {
     if (!$url) $url = G4_URL;
-    $p = parse_url($url);
-    return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
+    //$p = parse_url($url);
+    //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
+    return $url;
 }
 
 
diff --git a/lib/outlogin.lib.php b/lib/outlogin.lib.php
index 077a4bd5a..aee773096 100644
--- a/lib/outlogin.lib.php
+++ b/lib/outlogin.lib.php
@@ -34,7 +34,7 @@ function outlogin($skin_dir='basic')
             $is_auth = true;
     }
 
-    $outlogin_url        = login_url();
+    $outlogin_url        = login_url($urlencode);
     $outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php';
 
     ob_start();