diff --git a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
index ce504c2aaa..3e8c77262f 100644
--- a/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
+++ b/openam-ui/openam-ui-ria/src/main/js/org/forgerock/openam/ui/user/login/RESTLoginHelper.js
@@ -128,7 +128,7 @@ define([
         const promise = $.Deferred();
         let context = "";
 
-        const goto = query.parseParameters(URIUtils.getCurrentFragmentQueryString()).goto;
+        const goto = query.parseParameters(URIUtils.getCurrentCompositeQueryString()).goto;
 
         if (goto) {
             AuthNService.validateGotoUrl(goto).then((data) => {