From 7f3807770bbcb318ea6ce3e5c741d2d3fae53c81 Mon Sep 17 00:00:00 2001
From: Pedro Igor <pigor.craveiro@gmail.com>
Date: Mon, 6 Apr 2026 18:07:10 -0300
Subject: [PATCH] Do not use inline handlers when rendering org buttons

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>

Closes #48049
---
 .../resources/theme/base/login/select-organization.ftl     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/src/main/resources/theme/base/login/select-organization.ftl b/themes/src/main/resources/theme/base/login/select-organization.ftl
index 6206afd588c2..09116093c0d8 100755
--- a/themes/src/main/resources/theme/base/login/select-organization.ftl
+++ b/themes/src/main/resources/theme/base/login/select-organization.ftl
@@ -8,15 +8,14 @@
                 <ul class="${properties.kcFormSocialAccountListClass!} <#if user.organizations?size gt 3>${properties.kcFormSocialAccountListGridClass!}</#if>">
                     <#list user.organizations as organization>
                         <li>
-                            <a id="organization-${organization.alias}" class="${properties.kcFormSocialAccountListButtonClass!} <#if user.organizations?size gt 3>${properties.kcFormSocialAccountGridItem!}</#if>"
-                               type="button" onclick="document.forms[0]['kc.org'].value = '${organization.alias}'; document.forms[0].requestSubmit()">
+                            <button type="submit" id="organization-${organization.alias}" class="${properties.kcFormSocialAccountListButtonClass!} <#if user.organizations?size gt 3>${properties.kcFormSocialAccountGridItem!}</#if>"
+                               name="kc.org" value="${organization.alias!}">
                                 <span class="${properties.kcFormSocialAccountNameClass!}">${organization.name!}</span>
-                            </a>
+                            </button>
                         </li>
                     </#list>
                 </ul>
             </div>
-            <input type="hidden" name="kc.org"/>
         </form>
     </#if>