diff --git a/index.php b/index.php
index 7aab0826..07c2a8d6 100644
--- a/index.php
+++ b/index.php
@@ -39,7 +39,12 @@ if(file_exists(BASE . 'install') && (!isset($config['installed']) || !$config['i
 	die('Setup detected that <b>install/</b> directory exists. Please visit <a href="' . BASE_URL . 'install">this</a> url to start MyAAC Installation.<br/>Delete <b>install/</b> directory if you already installed MyAAC.<br/>Remember to REFRESH this page when you\'re done!');
 }
 
-$uri = str_replace(BASE_DIR . '/', '', $_SERVER['REQUEST_URI']);
+$uri = $_SERVER['REQUEST_URI'];
+if(!empty(BASE_DIR))
+	$uri = str_replace(BASE_DIR . '/', '', $uri);
+else
+	$uri = str_replace_first('/', '', $uri);
+
 $uri = str_replace('index.php/', '', $uri);
 $uri = str_replace('?', '', $uri);
 
diff --git a/system/functions.php b/system/functions.php
index 3b3a920c..a14666aa 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -1195,4 +1195,12 @@ function load_config_lua($filename)
 	$result = array_merge($result, isset($config['lua']) ? $config['lua'] : array());
 	return $result;
 }
+
+function str_replace_first($search, $replace, $subject) {
+    $pos = strpos($subject, $search);
+    if ($pos !== false) {
+        return substr_replace($subject, $replace, $pos, strlen($search));
+    }
+    return $subject;
+}
 ?>