diff --git a/ajax.php b/ajax.php
index 5210b628..a629af63 100644
--- a/ajax.php
+++ b/ajax.php
@@ -30,5 +30,5 @@ function clientLoginPage($msg='Unauthorized') {
         url_get('^client', 'client')
     ))
 );
-print $dispatcher->resolve($_SERVER['PATH_INFO']);
+print $dispatcher->resolve($ost->get_path_info());
 ?>
diff --git a/api/http.php b/api/http.php
index 0fc32444..90926d1e 100644
--- a/api/http.php
+++ b/api/http.php
@@ -26,5 +26,5 @@
         );
 
 # Call the respective function
-print $dispatcher->resolve($_SERVER['PATH_INFO']);
+print $dispatcher->resolve($ost->get_path_info());
 ?>
diff --git a/scp/ajax.php b/scp/ajax.php
index e4100f4e..0f0771d3 100644
--- a/scp/ajax.php
+++ b/scp/ajax.php
@@ -27,7 +27,7 @@ function staffLoginPage($msg='Unauthorized') {
 ini_set('display_errors','0'); //Disable error display
 ini_set('display_startup_errors','0');
 
-//TODO: disable direct access via the browser? i,e All request must have REFER? 
+//TODO: disable direct access via the browser? i,e All request must have REFER?
 if(!defined('INCLUDE_DIR'))	Http::response(500, 'Server configuration error');
 
 require_once INCLUDE_DIR.'/class.dispatcher.php';
@@ -65,5 +65,5 @@ function staffLoginPage($msg='Unauthorized') {
 );
 
 # Call the respective function
-print $dispatcher->resolve($_SERVER['PATH_INFO']);
+print $dispatcher->resolve($ost->get_path_info());
 ?>