diff --git a/gigya_raas/js/gigyaRaas.js b/gigya_raas/js/gigyaRaas.js
index d8f2cfa..2b016a6 100644
--- a/gigya_raas/js/gigyaRaas.js
+++ b/gigya_raas/js/gigyaRaas.js
@@ -46,7 +46,7 @@ var getUrlPrefix = function () {
         redirectTarget = redirectTarget.substring(drupalSettings.path.baseUrl.length);
       }
 
-      redirectTarget = drupalSettings.gigya.raas.origin + drupalSettings.path.baseUrl + redirectTarget;
+      redirectTarget = drupalSettings.gigya.raas.origin + getUrlPrefix() + redirectTarget;
     }
     if (typeof sendSetSSOToken === 'undefined' || sendSetSSOToken === false) {
       location.replace(redirectTarget);
@@ -61,7 +61,7 @@ var getUrlPrefix = function () {
       redirectTarget = redirectTarget.substring(drupalSettings.path.baseUrl.length);
     }
 
-    redirectTarget = drupalSettings.gigya.raas.origin + drupalSettings.path.baseUrl + redirectTarget;
+    redirectTarget = drupalSettings.gigya.raas.origin + getUrlPrefix() + redirectTarget;
     document.location = redirectTarget;
   };