diff --git a/APPL/Shared/Common.inc b/APPL/Shared/Common.inc
index 81f9fa2fc4..741adc3181 100644
--- a/APPL/Shared/Common.inc
+++ b/APPL/Shared/Common.inc
@@ -254,8 +254,13 @@ if (user_key < 0 && typeof ANONYMOUS_Allowed == "undefined")
 
     if (!url.match(/^http/))
         var url = rooturl + "/" + url; // "appl/shared/login.asp";
-    ret_page = String(Request.ServerVariables("SCRIPT_NAME"));
-    ret_page = ret_page.replace(/\/default.asp$/i, "/");
+    var ret_page = "";
+    if (String(Request.ServerVariables("REQUEST_METHOD")) == "GET")
+    {
+        ret_page = String(Request.ServerVariables("SCRIPT_NAME"));
+        ret_page = ret_page.replace(/\/default.asp$/i, "/");
+    }
+
     var qs = String(Request.ServerVariables("QUERY_STRING"));
     if ((qs && qs != 'fac_id=' + customerId) || (ret_page && ret_page != rooturl + "/"))
     {
diff --git a/APPL/Shared/login.asp b/APPL/Shared/login.asp
index 882822af0e..41ad109a34 100644
--- a/APPL/Shared/login.asp
+++ b/APPL/Shared/login.asp
@@ -29,7 +29,7 @@ if (Request.QueryString.Count > 0)
     }
 }
 
-var ret_page = getQParam("ret_page", rooturl + "/");
+var ret_page = getQParam("ret_page", "");
 var querystring = getQParam("querystring", "");
 
 FCLTHeader.Requires({plugins: ["jQuery"], js:["jQuery-ui.js"]});
@@ -54,7 +54,11 @@ if (device.test(device.isMobile))
         }
         else if (json.success)
         {
-            window.location.href = "<%=safe.jsstring(ret_page + (querystring?"?" + querystring:""))%>";
+            <% if (ret_page) { %>
+                window.location.href = "<%=safe.jsstring(ret_page + (querystring?"?" + querystring:""))%>";
+            <% } else { %>
+                window.top.location.href = "<%=rooturl + "/"%>";
+            <% } %>
         }
     }