diff --git a/integration/js/src/main/resources/keycloak.js b/integration/js/src/main/resources/keycloak.js
index 046c9c1..1a6b545 100755
--- a/integration/js/src/main/resources/keycloak.js
+++ b/integration/js/src/main/resources/keycloak.js
@@ -131,7 +131,7 @@ var Keycloak = function (config) {
kc.createAccountUrl = function(options) {
var url = getRealmUrl()
+ '/account'
- + '?referrer=' + kc.clientId
+ + '?referrer=' + encodeURIComponent(kc.clientId)
+ '&referrer_uri=' + encodeURIComponent(adapter.redirectUri(options));
return url;