diff --git a/src/login/Template.tsx b/src/login/Template.tsx
index d5e84144..09492792 100644
--- a/src/login/Template.tsx
+++ b/src/login/Template.tsx
@@ -22,6 +22,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
         socialProvidersNode = null,
         infoNode = null,
         documentTitle,
+        bodyClassName,
         kcContext,
         i18n,
         doUseDefaultCss,
@@ -46,7 +47,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
 
     useSetClassName({
         "qualifiedName": "body",
-        "className": getClassName("kcBodyClass")
+        "className": bodyClassName ?? getClassName("kcBodyClass")
     });
 
     useEffect(() => {
diff --git a/src/login/TemplateProps.ts b/src/login/TemplateProps.ts
index 82cc9128..c6503daf 100644
--- a/src/login/TemplateProps.ts
+++ b/src/login/TemplateProps.ts
@@ -17,6 +17,7 @@ export type TemplateProps<KcContext extends KcContext.Common, I18nExtended exten
     socialProvidersNode?: ReactNode;
     infoNode?: ReactNode;
     documentTitle?: string;
+    bodyClassName?: string;
 
     children: ReactNode;
 };
diff --git a/src/login/kcContext/KcContext.ts b/src/login/kcContext/KcContext.ts
index b61a0ba5..e8b68b54 100644
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@@ -262,6 +262,7 @@ export declare namespace KcContext {
             client: string;
             clientScopesRequested: {
                 consentScreenText: string;
+                dynamicScopeParameter?: string;
             }[];
         };
         url: {
diff --git a/src/login/pages/LoginOauthGrant.tsx b/src/login/pages/LoginOauthGrant.tsx
index 2938ed23..a3935055 100644
--- a/src/login/pages/LoginOauthGrant.tsx
+++ b/src/login/pages/LoginOauthGrant.tsx
@@ -18,18 +18,54 @@ export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pa
     return (
         <Template
             {...{ kcContext, i18n, doUseDefaultCss, classes }}
-            headerNode={msg("oauthGrantTitle", client.name ? advancedMsgStr(client.name) : client.clientId)}
+            bodyClassName="oauth"
+            headerNode={
+                <>
+                    {client.attributes.logoUri && <img src={client.attributes.logoUri} />}
+                    <p>{client.name ? msg("oauthGrantTitle", advancedMsgStr(client.name)) : msg("oauthGrantTitle", client.clientId)}</p>
+                </>
+            }
         >
             <div id="kc-oauth" className="content-area">
                 <h3>{msg("oauthGrantRequest")}</h3>
                 <ul>
                     {oauth.clientScopesRequested.map(clientScope => (
                         <li key={clientScope.consentScreenText}>
-                            <span>{advancedMsg(clientScope.consentScreenText)}</span>
+                            <span>
+                                {advancedMsg(clientScope.consentScreenText)}
+                                {clientScope.dynamicScopeParameter && (
+                                    <>
+                                        : <b>{clientScope.dynamicScopeParameter}</b>
+                                    </>
+                                )}
+                            </span>
                         </li>
                     ))}
                 </ul>
 
+                {client.attributes.policyUri ||
+                    (client.attributes.tosUri && (
+                        <h3>
+                            {client.name ? msg("oauthGrantInformation", advancedMsgStr(client.name)) : msg("oauthGrantInformation", client.clientId)}
+                            {client.attributes.tosUri && (
+                                <>
+                                    {msg("oauthGrantReview")}
+                                    <a href={client.attributes.tosUri} target="_blank">
+                                        {msg("oauthGrantTos")}
+                                    </a>
+                                </>
+                            )}
+                            {client.attributes.policyUri && (
+                                <>
+                                    {msg("oauthGrantReview")}
+                                    <a href={client.attributes.policyUri} target="_blank">
+                                        {msg("oauthGrantPolicy")}
+                                    </a>
+                                </>
+                            )}
+                        </h3>
+                    ))}
+
                 <form className="form-actions" action={url.oauthAction} method="POST">
                     <input type="hidden" name="code" value={oauth.code} />
                     <div className={getClassName("kcFormGroupClass")}>