diff --git a/adjuster.py b/adjuster.py
index f6ee60aafa0e7256ae7cd9ad186b20a241f9fd81..531e96e40db1677d1f7629d7109b2725af943188 100755
--- a/adjuster.py
+++ b/adjuster.py
@@ -1536,11 +1536,9 @@ document.forms[0].i.focus()
 
     def doReq(self):
         debuglog("doReq "+self.request.uri)
-        if wsgi_mode and self.request.path==urllib.quote(os.environ.get("SCRIPT_NAME",'0')+os.environ.get("PATH_INFO","")) and 'SCRIPT_URL' in os.environ:
+        if wsgi_mode and self.request.path==urllib.quote(os.environ.get("SCRIPT_NAME","")+os.environ.get("PATH_INFO","")) and 'SCRIPT_URL' in os.environ:
             # workaround for Tornado 2.x limitation when used with htaccess redirects
-            self.request.path = os.environ['SCRIPT_URL']
-            self.request.uri = self.request.path
-            if "QUERY_STRING" in os.environ: self.request.uri += '?'+os.environ["QUERY_STRING"]
+            self.request.uri = self.request.path = os.environ['SCRIPT_URL']
         if self.request.headers.get("User-Agent","")=="ping":
             if self.request.uri=="/ping2": return self.answerPing(True)
             elif self.request.uri=="/ping": return self.answerPing(False)