diff --git a/app/custom-oauth/client/custom_oauth_client.js b/app/custom-oauth/client/custom_oauth_client.js
index f1561c84e5d17..40e802be8f6ed 100644
--- a/app/custom-oauth/client/custom_oauth_client.js
+++ b/app/custom-oauth/client/custom_oauth_client.js
@@ -93,8 +93,8 @@ export class CustomOAuth {
 		}${ separator }client_id=${ config.clientId
 		}&redirect_uri=${ encodeURIComponent(OAuth._redirectUri(this.name, config))
 		}&response_type=code`
-			+ `&state=${ OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl)
-			}&scope=${ this.scope }`;
+			+ `&state=${ encodeURIComponent(OAuth._stateParam(loginStyle, credentialToken, options.redirectUrl))
+			}&scope=${ encodeURIComponent(this.scope) }`;
 
 		OAuth.launchLogin({
 			loginService: this.name,