diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
index d153776e74..2141001554 100644
--- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
+++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -312,7 +312,7 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea
      */
     @RequirePOST
     public void doCreateAccountByAdmin(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
-        createAccountByAdmin(req, rsp, "addUser.jelly", "."); // send the user back to the listing page on success
+        createAccountByAdmin(req, rsp, "addUserDialog.jelly", "."); // send the user back to the listing page on success
     }
 
     /**
diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
index 4595b38c48..1b8a888384 100644
--- a/core/src/main/resources/hudson/model/User/index.jelly
+++ b/core/src/main/resources/hudson/model/User/index.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
 
       <t:editableDescription permission="${app.ADMINISTER}" hideButton="true"/>
       <div>
-        ${%Jenkins User ID}: ${it.id}
+        ${%Username}: ${it.id}
       </div>
       <!-- give properties a chance to contribute summary item -->
       <j:forEach var="p" items="${it.allProperties}">
diff --git a/core/src/main/resources/hudson/model/User/index_bg.properties b/core/src/main/resources/hudson/model/User/index_bg.properties
index 7d82c30d24..6e7d7af3cc 100644
--- a/core/src/main/resources/hudson/model/User/index_bg.properties
+++ b/core/src/main/resources/hudson/model/User/index_bg.properties
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=\
- Идентификатор на потребител на Jenkins
+Username=\
+ Потребител
 Groups=\
  Групи
diff --git a/core/src/main/resources/hudson/model/User/index_ca.properties b/core/src/main/resources/hudson/model/User/index_ca.properties
deleted file mode 100644
index 77b360264a..0000000000
--- a/core/src/main/resources/hudson/model/User/index_ca.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Jenkins\ User\ Id=Id d''''usuari a Jenkins
diff --git a/core/src/main/resources/hudson/model/User/index_cs.properties b/core/src/main/resources/hudson/model/User/index_cs.properties
deleted file mode 100644
index a5f445dd1d..0000000000
--- a/core/src/main/resources/hudson/model/User/index_cs.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ User\ Id=Jenkins Id uživatele
diff --git a/core/src/main/resources/hudson/model/User/index_da.properties b/core/src/main/resources/hudson/model/User/index_da.properties
index b1f64e6e35..793e5c95d1 100644
--- a/core/src/main/resources/hudson/model/User/index_da.properties
+++ b/core/src/main/resources/hudson/model/User/index_da.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins BrugerID
+Username=Brugernavn
diff --git a/core/src/main/resources/hudson/model/User/index_de.properties b/core/src/main/resources/hudson/model/User/index_de.properties
index 67c1067bf8..7b268b2263 100644
--- a/core/src/main/resources/hudson/model/User/index_de.properties
+++ b/core/src/main/resources/hudson/model/User/index_de.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins Benutzer Id
+Username=Benutzername
 Groups=Gruppen
diff --git a/core/src/main/resources/hudson/model/User/index_el.properties b/core/src/main/resources/hudson/model/User/index_el.properties
deleted file mode 100644
index b8d01e772c..0000000000
--- a/core/src/main/resources/hudson/model/User/index_el.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Jenkins\ User\ Id=Κωδικός Χρήστη Jenkins
diff --git a/core/src/main/resources/hudson/model/User/index_es.properties b/core/src/main/resources/hudson/model/User/index_es.properties
index e11bdca7c5..be76afa3df 100644
--- a/core/src/main/resources/hudson/model/User/index_es.properties
+++ b/core/src/main/resources/hudson/model/User/index_es.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Id de Usuario Jenkins
+Username=Usuario
diff --git a/core/src/main/resources/hudson/model/User/index_fi.properties b/core/src/main/resources/hudson/model/User/index_fi.properties
index 4fe2d942ae..cc69bae750 100644
--- a/core/src/main/resources/hudson/model/User/index_fi.properties
+++ b/core/src/main/resources/hudson/model/User/index_fi.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins käyttäjätunnus
+Username=Käyttäjätunnus
diff --git a/core/src/main/resources/hudson/model/User/index_fr.properties b/core/src/main/resources/hudson/model/User/index_fr.properties
index 00a8549e86..b6a3801861 100644
--- a/core/src/main/resources/hudson/model/User/index_fr.properties
+++ b/core/src/main/resources/hudson/model/User/index_fr.properties
@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 Groups=Groupes
-Jenkins\ User\ Id=Identifiant d''utilisateur Jenkins
+Username=Nom d''utilisateur
diff --git a/core/src/main/resources/hudson/model/User/index_hu.properties b/core/src/main/resources/hudson/model/User/index_hu.properties
deleted file mode 100644
index 94c8b307d4..0000000000
--- a/core/src/main/resources/hudson/model/User/index_hu.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ User\ Id=Jenkins azonosító
diff --git a/core/src/main/resources/hudson/model/User/index_it.properties b/core/src/main/resources/hudson/model/User/index_it.properties
index 9e18f7b5d7..6d5457d9aa 100644
--- a/core/src/main/resources/hudson/model/User/index_it.properties
+++ b/core/src/main/resources/hudson/model/User/index_it.properties
@@ -22,4 +22,4 @@
 # THE SOFTWARE.
 
 Groups=Gruppi
-Jenkins\ User\ ID=ID utente Jenkins
+Username=Nome utente
diff --git a/core/src/main/resources/hudson/model/User/index_ja.properties b/core/src/main/resources/hudson/model/User/index_ja.properties
index 0d5f939253..33145e67eb 100644
--- a/core/src/main/resources/hudson/model/User/index_ja.properties
+++ b/core/src/main/resources/hudson/model/User/index_ja.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins ユーザーID
+Username=ユーザー名
 Groups=グループ
diff --git a/core/src/main/resources/hudson/model/User/index_ko.properties b/core/src/main/resources/hudson/model/User/index_ko.properties
index fbc7442997..21b881ab2b 100644
--- a/core/src/main/resources/hudson/model/User/index_ko.properties
+++ b/core/src/main/resources/hudson/model/User/index_ko.properties
@@ -1,3 +1,3 @@
 # This file is under the MIT License by authors
 
-Jenkins\ User\ Id=Jenkins 사용자 Id
+Username=계정명
diff --git a/core/src/main/resources/hudson/model/User/index_lt.properties b/core/src/main/resources/hudson/model/User/index_lt.properties
deleted file mode 100644
index 6764891efe..0000000000
--- a/core/src/main/resources/hudson/model/User/index_lt.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Jenkins\ User\ Id=Jenkins vartotojo Id
diff --git a/core/src/main/resources/hudson/model/User/index_lv.properties b/core/src/main/resources/hudson/model/User/index_lv.properties
deleted file mode 100644
index b245900586..0000000000
--- a/core/src/main/resources/hudson/model/User/index_lv.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ User\ Id=Jenkins lietotāja identifikators
diff --git a/core/src/main/resources/hudson/model/User/index_nb_NO.properties b/core/src/main/resources/hudson/model/User/index_nb_NO.properties
deleted file mode 100644
index 3ffcf4b27c..0000000000
--- a/core/src/main/resources/hudson/model/User/index_nb_NO.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ User\ Id=Jenkins bruker-id
diff --git a/core/src/main/resources/hudson/model/User/index_nl.properties b/core/src/main/resources/hudson/model/User/index_nl.properties
index 59aeb6e4d5..8be46f6a43 100644
--- a/core/src/main/resources/hudson/model/User/index_nl.properties
+++ b/core/src/main/resources/hudson/model/User/index_nl.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins gebruikersnaam
+Username=Gebruikersnaam
diff --git a/core/src/main/resources/hudson/model/User/index_pl.properties b/core/src/main/resources/hudson/model/User/index_pl.properties
index f544ee9d64..45523fdc6e 100644
--- a/core/src/main/resources/hudson/model/User/index_pl.properties
+++ b/core/src/main/resources/hudson/model/User/index_pl.properties
@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 Groups=Grupy
-Jenkins\ User\ ID=Identyfikator użytkownika Jenkins
+Username=Login
diff --git a/core/src/main/resources/hudson/model/User/index_pt_BR.properties b/core/src/main/resources/hudson/model/User/index_pt_BR.properties
index d021757225..eccef53848 100644
--- a/core/src/main/resources/hudson/model/User/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/model/User/index_pt_BR.properties
@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 Groups=Grupos
-Jenkins\ User\ ID=ID\ do\ usuário\ do\ Jenkins
+Username=Nome de usuário
diff --git a/core/src/main/resources/hudson/model/User/index_pt_PT.properties b/core/src/main/resources/hudson/model/User/index_pt_PT.properties
deleted file mode 100644
index 672eb4a782..0000000000
--- a/core/src/main/resources/hudson/model/User/index_pt_PT.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Jenkins\ User\ Id=Id Utilizador Jenkins
diff --git a/core/src/main/resources/hudson/model/User/index_ru.properties b/core/src/main/resources/hudson/model/User/index_ru.properties
index c65f40993d..aacf93f060 100644
--- a/core/src/main/resources/hudson/model/User/index_ru.properties
+++ b/core/src/main/resources/hudson/model/User/index_ru.properties
@@ -21,4 +21,4 @@
 # THE SOFTWARE.
 
 Groups=Группы
-Jenkins\ User\ Id=Идентификатор пользователя
+Username=Имя пользователя
diff --git a/core/src/main/resources/hudson/model/User/index_sk.properties b/core/src/main/resources/hudson/model/User/index_sk.properties
deleted file mode 100644
index be18d357f1..0000000000
--- a/core/src/main/resources/hudson/model/User/index_sk.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is under the MIT License by authors
-
-Jenkins\ User\ Id=Prihlasovacie meno do Jenkins
diff --git a/core/src/main/resources/hudson/model/User/index_sr.properties b/core/src/main/resources/hudson/model/User/index_sr.properties
index 986ce51196..ef209ebb27 100644
--- a/core/src/main/resources/hudson/model/User/index_sr.properties
+++ b/core/src/main/resources/hudson/model/User/index_sr.properties
@@ -1,4 +1,4 @@
 # This file is under the MIT License by authors
 
 Groups=Групе
-Jenkins\ User\ Id=Jenkins идентификациони број
+Username=Корисничко име
diff --git a/core/src/main/resources/hudson/model/User/index_sv_SE.properties b/core/src/main/resources/hudson/model/User/index_sv_SE.properties
index a2019373ea..6d30089808 100644
--- a/core/src/main/resources/hudson/model/User/index_sv_SE.properties
+++ b/core/src/main/resources/hudson/model/User/index_sv_SE.properties
@@ -1,5 +1,4 @@
 # This file is under the MIT License by authors
 
-Jenkins\ User\ Id=Jenkins användar-ID
-Jenkins\ User\ ID=Jenkins användar-ID
+Username=Användarnamn
 Groups=Grupper
diff --git a/core/src/main/resources/hudson/model/User/index_tr.properties b/core/src/main/resources/hudson/model/User/index_tr.properties
index e763f02a6e..7f77216364 100644
--- a/core/src/main/resources/hudson/model/User/index_tr.properties
+++ b/core/src/main/resources/hudson/model/User/index_tr.properties
@@ -1,3 +1,3 @@
 # This file is under the MIT License by authors
 
-Jenkins\ User\ Id=Jenkins Kullanıcı kimliği
+Username=Kullanıcı Adı
diff --git a/core/src/main/resources/hudson/model/User/index_uk.properties b/core/src/main/resources/hudson/model/User/index_uk.properties
deleted file mode 100644
index 2d85587544..0000000000
--- a/core/src/main/resources/hudson/model/User/index_uk.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Jenkins\ User\ Id=Код користувача в Дженкінс:
diff --git a/core/src/main/resources/hudson/model/User/index_zh_TW.properties b/core/src/main/resources/hudson/model/User/index_zh_TW.properties
index acfe3573dc..e563e60a76 100644
--- a/core/src/main/resources/hudson/model/User/index_zh_TW.properties
+++ b/core/src/main/resources/hudson/model/User/index_zh_TW.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Jenkins\ User\ Id=Jenkins 使用者 ID
+Username=使用者名稱
 Groups=群組
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
index aaca72246d..8db6f5f95b 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
@@ -29,85 +29,62 @@ THE SOFTWARE.
     <st:attribute name="it" use="required" type="hudson.security.HudsonPrivateSecurityRealm">
       Context where the page is loaded.
     </st:attribute>
-    <st:attribute name="title" use="required"> <![CDATA[
-      Title of the HTML page. Rendered in the page content inside a <h1>.
+    <st:attribute name="title" use="optional"> <![CDATA[
+      Optional title of the form. Rendered in the page content inside a <h1>.
     ]]>
     </st:attribute>
     <st:attribute name="action" use="required">
       The method to call from within the HudsonPrivateSecurityRealm.
     </st:attribute>
-    <st:attribute name="captcha" use="optional">
-      Determines if the tag will include the captcha.
-    </st:attribute>
     <st:attribute name="data" use="optional" type="hudson.security.HudsonPrivateSecurityRealm.SignupInfo">
       The wrapper for the data provided by the user and the error message(s) if any. Is null on first form display.
     </st:attribute>
   </st:documentation>
 
-  <h1>${title}</h1>
-  <div class="form-content">
-    <table>
-      <tr>
-        <f:entry title="${%Username}" class="${data.errors.containsKey('username') ? 'jenkins-!-margin-bottom-2' : ''}">
-          <input class="jenkins-input" type="text" name="username" id="username" value="${data.username}" autofocus="autofocus" />
-        </f:entry>
-        <j:if test="${data.errors.containsKey('username')}">
-          <div class="error jenkins-!-margin-bottom-2">
-            ${data.errors.get('username')}
-          </div>
-        </j:if>
-      </tr>
-      <tr>
-        <f:entry title="${%Password}" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
-          <input class="jenkins-input" type="password" name="password1" value="${data.password1}" />
-        </f:entry>
-        <j:if test="${data.errors.containsKey('password1')}">
-          <div class="error jenkins-!-margin-bottom-2">
-            ${data.errors.get('password1')}
-          </div>
-        </j:if>
-      </tr>
-      <tr>
-        <f:entry title="${%Confirm password}" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
-          <input class="jenkins-input" type="password" name="password2" value="${data.password2}" />
-        </f:entry>
-        <j:if test="${data.errors.containsKey('password1')}">
-          <div class="error jenkins-!-margin-bottom-2">
-            ${data.errors.get('password1')}
-          </div>
-        </j:if>
-      </tr>
-      <tr>
-        <f:entry title="${%Full name}" class="${data.errors.containsKey('fullname') ? 'jenkins-!-margin-bottom-2' : ''}">
-          <input class="jenkins-input" type="text" name="fullname" value="${data.fullname}" />
-        </f:entry>
-        <j:if test="${data.errors.containsKey('fullname')}">
-          <div class="error jenkins-!-margin-bottom-2">
-            ${data.errors.get('fullname')}
-          </div>
-        </j:if>
-      </tr>
-      <j:if test="${it.mailerPluginPresent}">
-        <tr>
-          <f:entry title="${%E-mail address}" class="${data.errors.containsKey('email') ? 'jenkins-!-margin-bottom-2' : ''}">
-            <input class="jenkins-input" type="text" name="email" value="${data.email}" />
-          </f:entry>
-          <j:if test="${data.errors.containsKey('email')}">
-            <div class="error jenkins-!-margin-bottom-2">
-              ${data.errors.get('email')}
-            </div>
-          </j:if>
-        </tr>
-      </j:if>
-      <j:if test="${captcha}">
-        <tr>
-          <td>${%Enter text as shown}:</td>
-          <td>
-            <input class="jenkins-input" type="text" name="captcha" autocomplete="off" /><br />
-            <img src="${rootURL}/securityRealm/captcha" alt="[${%captcha}]" />
-          </td>
-        </tr>
-      </j:if>
-    </table>
-  </div>
+  <j:if test="${attrs.title != null}">
+    <h1>${title}</h1>
+  </j:if>
+
+  <f:entry title="${%Username}" class="${data.errors.containsKey('username') ? 'jenkins-!-margin-bottom-2' : ''}">
+    <input class="jenkins-input" type="text" name="username" id="username" value="${data.username}" autofocus="autofocus" />
+  </f:entry>
+  <j:if test="${data.errors.containsKey('username')}">
+    <div class="error jenkins-!-margin-bottom-2">
+      ${data.errors.get('username')}
+    </div>
+  </j:if>
+  <f:entry title="${%Password}" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
+    <input class="jenkins-input" type="password" name="password1" value="${data.password1}" />
+  </f:entry>
+  <j:if test="${data.errors.containsKey('password1')}">
+    <div class="error jenkins-!-margin-bottom-2">
+      ${data.errors.get('password1')}
+    </div>
+  </j:if>
+  <f:entry title="${%Confirm password}" class="${data.errors.containsKey('password1') ? 'jenkins-!-margin-bottom-2' : ''}">
+    <input class="jenkins-input" type="password" name="password2" value="${data.password2}" />
+  </f:entry>
+  <j:if test="${data.errors.containsKey('password1')}">
+    <div class="error jenkins-!-margin-bottom-2">
+      ${data.errors.get('password1')}
+    </div>
+  </j:if>
+  <f:entry title="${%Full name}" class="${data.errors.containsKey('fullname') ? 'jenkins-!-margin-bottom-2' : ''}">
+    <input class="jenkins-input" type="text" name="fullname" value="${data.fullname}" />
+  </f:entry>
+  <j:if test="${data.errors.containsKey('fullname')}">
+    <div class="error jenkins-!-margin-bottom-2">
+      ${data.errors.get('fullname')}
+    </div>
+  </j:if>
+  <j:if test="${it.mailerPluginPresent}">
+    <f:entry title="${%Email}" class="${data.errors.containsKey('email') ? 'jenkins-!-margin-bottom-2' : ''}">
+      <input class="jenkins-input" type="text" name="email" value="${data.email}" />
+    </f:entry>
+    <j:if test="${data.errors.containsKey('email')}">
+      <div class="error jenkins-!-margin-bottom-2">
+        ${data.errors.get('email')}
+      </div>
+    </j:if>
+  </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
index 20586ec06d..7bb654dd9a 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryFormPage.jelly
@@ -37,9 +37,6 @@ THE SOFTWARE.
     <st:attribute name="action" use="required">
       The method to call from within the HudsonPrivateSecurityRealm.
     </st:attribute>
-    <st:attribute name="captcha" use="optional" type="boolean">
-      Determines if the tag will include the captcha.
-    </st:attribute>
     <st:attribute name="data" use="optional" type="hudson.security.HudsonPrivateSecurityRealm.SignupInfo">
       The wrapper for the data provided by the user and the error message(s) if any. Is null on first form display.
     </st:attribute>
@@ -48,7 +45,7 @@ THE SOFTWARE.
     <l:breadcrumb title="${title}"/>
     <l:main-panel>
       <form action="${rootURL}/securityRealm/${action}" method="post" class="jenkins-form jenkins-form-item--small jenkins-!-margin-auto">
-        <local:_entryForm title="${title}" action="${action}" captcha="${captcha}" it="${host}" data="${data}" />
+        <local:_entryForm title="${title}" action="${action}" it="${host}" data="${data}" />
         <f:bottomButtonBar>
           <f:submit value="${title}" />
         </f:bottomButtonBar>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_bg.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_bg.properties
index 3e8c2cb01a..c92d3876f0 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_bg.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_bg.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-E-mail\ address=\
- Адрес на е-поща
 Password=\
  Парола
 Username=\
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_da.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_da.properties
index 47e3511dc4..8f682e4946 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_da.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_da.properties
@@ -25,4 +25,3 @@ Full\ name=Navn
 Username=Brugernavn
 Enter\ text\ as\ shown=Indtast den viste tekst
 Confirm\ password=Gentag adgangskode
-E-mail\ address=E-mail adresse
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_de.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_de.properties
index fd45054c0e..8a26ca639a 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_de.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_de.properties
@@ -2,5 +2,4 @@ Username=Benutzer
 Password=Passwort
 Confirm\ password=Passwort-Wiederholung
 Full\ name=Voller Name
-E-mail\ address=E-Mail-Adresse
 Enter\ text\ as\ shown=Text wie angezeigt eingeben
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_es.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_es.properties
index c1f350429a..3f9a5de8f4 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_es.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_es.properties
@@ -24,6 +24,5 @@ Username=Usuario
 Password=Contraseña
 Confirm\ password=Confirma la contraseña
 Full\ name=Nombre completo
-E-mail\ address=Dirección de email
 Enter\ text\ as\ shown=Introdude el texto mostrado
 Sign\ up=Crear una cuenta
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fi.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fi.properties
index fbb8b27bf4..f03d66a623 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fi.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fi.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Confirm\ password=Varmista salasana
-E-mail\ address=Sähköpostiosoite
 Full\ name=Koko nimi
 Password=Salasana
 Username=Käyttäjätunnus
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fr.properties
index 802160e8fb..0c714e69bc 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_fr.properties
@@ -24,5 +24,3 @@ Username=Nom d''utilisateur
 Password=Mot de passe
 Confirm\ password=Confirmation du mot de passe
 Full\ name=Nom complet
-E-mail\ address=Adresse courriel
-Enter\ text\ as\ shown=
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_it.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_it.properties
index 2d60721b4b..192cfd79f6 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_it.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_it.properties
@@ -23,7 +23,7 @@
 
 captcha=CAPTCHA
 Confirm\ password=Conferma password
-E-mail\ address=Indirizzo di posta elettronica
+Email=Indirizzo di posta elettronica
 Enter\ text\ as\ shown=Immettere il testo così come viene visualizzato
 Full\ name=Nome completo
 Password=Password
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ja.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ja.properties
index b9c738f7ea..4292ffc439 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ja.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ja.properties
@@ -25,5 +25,4 @@ Username=ユーザー名
 Password=パスワード
 Confirm\ password=パスワードの確認
 Full\ name=フルネーム
-E-mail\ address=メールアドレス
 Enter\ text\ as\ shown=テキスト
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ko.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ko.properties
index 8c15145e35..0911575b03 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ko.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ko.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Confirm\ password=암호 확인
-E-mail\ address=이메일 주소
 Enter\ text\ as\ shown=아래 보이는 문자 입력
 Full\ name=이름
 Password=암호
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_nl.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_nl.properties
index d0e41c9d23..12fc4c9304 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_nl.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_nl.properties
@@ -1,7 +1,6 @@
 # This file is under the MIT License by authors
 
 Confirm\ password=Bevestig wachtwoord
-E-mail\ address=E-mailadres
 Full\ name=Naam
 Password=Wachtwoord
 Username=Gebruikersnaam
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pl.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pl.properties
index 76cde2e0a8..be027614cf 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pl.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pl.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Confirm\ password=Powtórz hasło
-E-mail\ address=Adres e-mail
 Full\ name=Pełna nazwa
 Password=Hasło
 Username=Login
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties
index ce0a9828e4..93c69b35c2 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_pt_BR.properties
@@ -25,5 +25,5 @@ Username=Nome de usuário
 Enter\ text\ as\ shown=Digite o texto como mostrado
 Full\ name=Nome completo
 Confirm\ password=Confirmar a senha
-E-mail\ address=Endereço de e-mail
+Email=Email
 captcha=captcha
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ru.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ru.properties
index ef5cae70bd..2e5f01763f 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ru.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_ru.properties
@@ -21,7 +21,6 @@
 # THE SOFTWARE.
 
 Confirm\ password=Повторите пароль
-E-mail\ address=Адрес электронной почты
 Full\ name=Ф.И.О.
 Password=Пароль
 Username=Имя пользователя
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_sr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_sr.properties
index d99088eacf..422f9a1ae5 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_sr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_sr.properties
@@ -5,5 +5,4 @@ Password=Лозинка
 Confirm\ password=Потврдите лозинку
 Full\ name=Име и презиме
 Enter\ text\ as\ shown=Унесите текст како је приказан
-E-mail\ address=Адреса е-поште
 Sign\ up=Регистрација
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_tr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_tr.properties
index 7371b6ca2d..506ec79df8 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_tr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_tr.properties
@@ -24,5 +24,4 @@ Username=Kullanıcı Adı
 Password=Şifre
 Confirm\ password=Şifreyi Doğrula
 Full\ name=Tam İsim
-E-mail\ address=E-posta Adresi
 Enter\ text\ as\ shown=Metni gösterildiği gibi girin
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_TW.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_TW.properties
index 5f13b03b88..a052719e7f 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_TW.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm_zh_TW.properties
@@ -26,5 +26,5 @@ Username=使用者名稱
 Password=密碼
 Confirm\ password=確認密碼
 Full\ name=全名
-E-mail\ address=電子郵件信箱
+Email=電子信箱
 Enter\ text\ as\ shown=輸入下列文字
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
index b9b3f246c7..2339110f72 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUser.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm">
-  <local:_entryFormPage host="${it}" title="${%Create User}" action="createAccountByAdmin" captcha="${false}" data="${data}" />
+  <local:_entryFormPage host="${it}" title="${%Create User}" action="createAccountByAdmin" data="${data}" />
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUserDialog.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUserDialog.jelly
new file mode 100644
index 0000000000..c0cc30426c
--- /dev/null
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/addUserDialog.jelly
@@ -0,0 +1,38 @@
+<!--
+The MIT License
+
+Copyright (c) 2026, Jan Faracik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler"
+         xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" xmlns:f="/lib/form">
+  <st:setHeader name="X-Dialog-Title" value="${%Create User}" />
+
+  <l:ajax>
+    <form action="${rootURL}/securityRealm/createAccountByAdmin" method="post">
+      <local:_entryForm action="createAccountByAdmin" it="${it}" data="${data}" />
+      <f:bottomButtonBar>
+        <f:submit value="${%Create}" />
+      </f:bottomButtonBar>
+    </form>
+  </l:ajax>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
index b3568d1a6e..1d1cf1efb6 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm">
-  <local:_entryFormPage host="${it}" title="${%Create First Admin User}" action="createFirstAccount" captcha="${false}" data="${data}"/>
+  <local:_entryFormPage host="${it}" title="${%Create First Admin User}" action="createFirstAccount" data="${data}"/>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 40e12c017d..96b3e88389 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -28,14 +28,14 @@ THE SOFTWARE.
     <l:view>
       <l:app-bar title="${%Users}" subtitle="${it.allUsers.size()}">
         <l:isAdmin>
-          <a href="addUser" class="jenkins-button jenkins-button--primary">
+          <button class="jenkins-button jenkins-button--primary"
+                  data-type="dialog-opener"
+                  data-dialog-url="addUserDialog">
             <l:icon src="symbol-add" />
             ${%Create User}
-          </a>
+          </button>
         </l:isAdmin>
       </l:app-bar>
-
-      <p class="jenkins-page-description">${%blurb}</p>
     </l:view>
   </j:set>
 
@@ -44,8 +44,8 @@ THE SOFTWARE.
       <thead>
         <tr>
           <th class="jenkins-table__cell--tight" data-sort-disable="true" />
-          <th initialSortDir="down">${%User ID}</th>
-          <th>${%Name}</th>
+          <th initialSortDir="down">${%Username}</th>
+          <th>${%Full name}</th>
           <th class="jenkins-table__cell--tight" data-sort-disable="true" />
           <th class="jenkins-table__cell--tight" data-sort-disable="true" />
         </tr>
@@ -59,14 +59,14 @@ THE SOFTWARE.
               </div>
             </td>
             <td>
-              <a href="${user.url}/" class="jenkins-table__link model-link inside">${user.id}</a>
+              <a href="${user.url}/">${user.id}</a>
             </td>
             <td>
               ${user.fullName}
             </td>
             <td>
               <div class="jenkins-table__cell__button-wrapper">
-                <a href="${user.url}/" class="jenkins-button jenkins-button--tertiary">
+                <a href="${user.url}/account" class="jenkins-button jenkins-button--tertiary">
                   <l:icon src="symbol-settings" />
                 </a>
               </div>
@@ -74,8 +74,12 @@ THE SOFTWARE.
             <td>
               <j:if test="${user.canDelete()}">
                 <div class="jenkins-table__cell__button-wrapper">
-                  <l:confirmationLink href="${user.url}/doDelete" class="jenkins-button jenkins-button--tertiary jenkins-!-destructive-color"
-                                      post="true" message="${%delete.user(user.displayName)}">
+                  <l:confirmationLink href="${user.url}/doDelete"
+                                      class="jenkins-button jenkins-button--tertiary jenkins-!-destructive-color"
+                                      post="true"
+                                      title="${%delete.user(user.displayName)}"
+                                      okText="${%Delete}"
+                                      destructive="true">
                     <l:icon src="symbol-trash" />
                   </l:confirmationLink>
                 </div>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties
index bbce49c657..45d6df5fbd 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties
@@ -20,8 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=\
-These users can log into Jenkins. This is a sub set of <a href="../asynchPeople">this list</a>, \
-which also contains auto-created users who really just made some commits on some projects and have no \
-direct Jenkins access.
 delete.user=Delete Jenkins user ‘{0}’?
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_bg.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_bg.properties
index 776e5328a1..fe69b15db0 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_bg.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_bg.properties
@@ -24,10 +24,5 @@ Name=\
  Име
 Users=\
  Потребители
-blurb=\
- Тези потребители могат да се впишат в Jenkins. Това е съкратена версия на\
- <a href="../asynchPeople">този списък</a>, който съдържа също и автоматично\
- създадените потребители, които някога са подавали промени по някои проекти и\
- нямат директен достъп до Jenkins.
 User\ Id=\
  Идентификатор
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_da.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_da.properties
index ad6da23caf..03a148422b 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_da.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_da.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Disse brugere kan logge på Jenkins. Dette er en delmængde af <a href="../asynchPeople">denne liste</a>
 Name=Navn
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_de.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_de.properties
index 1597a62360..48da8cbf16 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_de.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_de.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=\
-  Diese Benutzer können sich bei Jenkins anmelden. Dies ist eine Untermenge <a href="../asynchPeople">jener Liste</a>, die zusätzlich automatisch angelegte Benutzer enthalten kann. Diese Benutzer haben zwar Commits zu Projekten beigetragen, dürfen sich aber nicht direkt bei Jenkins anmelden.
 Name=Name
 User\ Id=Benutzer-ID
 Users=Benutzer
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_es.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_es.properties
index 929a0d9444..fbc8b0384b 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_es.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_es.properties
@@ -20,10 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=\
-   Estos usuarios pueden entrar en Jenkins. Este es un subconjunto de <a href="../asynchPeople">esta lista</a>, \
-   que tambien incluyen usuarios creados automáticamente porque hayan hecho ''commits'' a proyectos. \
-   Los usuarios creados automáticamente no tienen acceso directo a Jenkins.
 Name=Nombre
 Users=Usuarios
 User\ Id=ID usuario
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_fr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_fr.properties
index 6f8d0f1c20..77ca3c81e0 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_fr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_fr.properties
@@ -21,5 +21,4 @@
 # THE SOFTWARE.
 
 Users=Utilisateurs
-blurb=Ces utilisateurs peuvent se logguer sur Jenkins. C''est le groupe contenant <a href="../asynchPeople">cette liste</a>, qui contient également les utilisateurs créés automatiquement qui ont simplement fait des commits sur certains projets et n''ont pas d''accès direct à Jenkins.
 Name=Nom
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_it.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_it.properties
index 5ac7a494e5..a2c052c8ba 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_it.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_it.properties
@@ -21,10 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Questi utenti possono accedere a Jenkins. Questo è un sottoinsieme \
-  di <a href="../asynchPeople">quest''elenco</a>, che contiene anche gli \
-  utenti creati automaticamente che hanno solamente eseguito dei commit in \
-  alcuni progetti e non hanno accesso diretto a Jenkins.
 Name=Nome
 User\ ID=ID utente
 Users=Utenti
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ja.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ja.properties
index e1a59d0325..6fabdbdf9b 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ja.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ja.properties
@@ -21,8 +21,5 @@
 # THE SOFTWARE.
 
 User\ Id=ユーザーID
-blurb=\
- これらのユーザーはJenkinsにログインすることができます。これは、Jenkinsにアクセスしていないけれども \
- いくつかのプロジェクトにコミットすると自動的に作成されるユーザーを含む<a href="../asynchPeople">このリスト</a>の一部です。
 Name=名前
 Users=ユーザー
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ko.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ko.properties
index e8ce68caf5..32ea8b1ceb 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ko.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ko.properties
@@ -23,4 +23,3 @@
 Name=이름
 User\ Id=사용자 ID
 Users=사용자
-blurb=이 사용자들은 Jenkins 에 로그인 할 수 있습니다. 이 사용자들은 <a href="../asynchPeople">개발자 목록</a>의 일부입니다. 개발자 목록은 단지 커밋만 하고 직접 Jenkins 에 접속하지 않은 자동 생성된 사람들을 포함합니다.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nb_NO.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nb_NO.properties
index 7f5398610a..c266fb7ff8 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nb_NO.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nb_NO.properties
@@ -23,4 +23,3 @@
 Name=Navn
 User\ Id=Bruker-id
 Users=Brukere
-blurb=Disse brukerne kan logge inn på Jenkins. De er et subsett av <a href="../asynchPeople">dene listen</a>, som også inneholder autogenererte brukere som egentlig bare har sjekket inn på noen prosjekter og ikke har direkte jenkins-tilgang.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nl.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nl.properties
index 0274709c47..b3ca0b8e82 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nl.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_nl.properties
@@ -3,4 +3,3 @@
 Name=Naam
 User\ Id=Gebruikersnaam
 Users=Gebruikers
-blurb=Deze gebruikers kunnen op Jenkins inloggen. Dit is een sub set van <a href="../asynchPeople">deze lijst</a>, deze bevat ook automatisch aangemaakte gebruikers die hebben bijgedragen bij een of meer projecten maar die geen directe toegang tot Jenkins hebben.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties
index c4945f3da1..64da07ea4b 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_BR.properties
@@ -22,6 +22,5 @@
 
 Name=Nome
 Users=Usuários
-blurb=Esses usuários podem entrar no Jenkins. Este é um sub-conjunto desta <a href="../asynchPeople">lista</a>, que também contém os usuários criados de forma automática ao executarem alguma confirmação nos projetos que o Jenkins tem acesso.
 User\ ID=Identificação do usuário
 Create\ User=Criar Usuário
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_PT.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_PT.properties
index ea787bb690..06d23b172c 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_PT.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_pt_PT.properties
@@ -3,4 +3,3 @@
 Name=Nome
 User\ Id=Id Utilizador
 Users=Utilizadores
-blurb=Estes utilizadores conseguem autenticar-se no Jenkins. Este é um sub conjunto <a href="../asynchPeople">desta lista</a>, que também contém utilizadores auto-criados que só realizaram alguns commits nalgum projecto e não têm acesso directo no Jenkins.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ru.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ru.properties
index cb4cb571d3..6073ef3cb9 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ru.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_ru.properties
@@ -23,4 +23,3 @@
 Name=Имя
 User\ Id=ID пользователя
 Users=Пользователи
-blurb=Перечисленные пользователи могут входить в Jenkins. Указанный список является подмножеством <a href="../asynchPeople">полного списка пользователей</a>, который в дополнение содержит автоматически созданных пользователей, которые вносили изменения в проекты (делали commit в SCM), и могут не иметь доступа к данному экземпляру Jenkins.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sr.properties
index a5e2014b35..b011497107 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sr.properties
@@ -1,8 +1,5 @@
 # This file is under the MIT License by authors
 
 Users=Корисници
-blurb=\
-Ови корисниви могу се пријавити на Jenkins, што је подскуп <a href="../asynchPeople">овог списка</a>, \
-који садржи и аутоматски-креиране кориснике без кирекног приступа на Jenkins.
 User\ Id=Идентификациони број корисника
 Name=Име
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sv_SE.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sv_SE.properties
index bd81d7b4fd..8469971d25 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sv_SE.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_sv_SE.properties
@@ -20,10 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=\
-Dessa användare kan logga in på Jenkins. Detta är en delmängd av <a href="../asynchPeople">denna lista</a> \
-som även innehåller automatiskt skapade användare som egentligen bara gjort några incheckningar på vissa projekt\
-och saknar direkt åtkomst till Jenkins.
 delete.user=Radera Jenkins-användaren "{0}"?
 
 Name=Namn
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_tr.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_tr.properties
index 836f8ef579..cbc225c3e1 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_tr.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_tr.properties
@@ -22,9 +22,5 @@
 
 Users=Kullanıcılar
 Create\ User=Kullanıcı Oluştur
-blurb=\
-Bu kullanıcılar Jenkins''de oturum açabilir. Bu liste, <a href="../asynchPeople">buradakinin</a> bir üst kümesidir, \
-aynı zamanda bazı projelerde commit işlemi yapan, fakat direk Jenkins erişimi olmayan ve otomatik olarak oluşturulan \
-kullanıcıları da içerir
 User\ ID=Kullanıcı ID
 Name=İsim
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_TW.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_TW.properties
index ce0ab58090..ba95f91071 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_TW.properties
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index_zh_TW.properties
@@ -22,8 +22,5 @@
 # THE SOFTWARE.
 
 Users=使用者
-blurb=\
-  這些使用者可以登入 Jenkins。這是<a href="../asynchPeople">這份清單</a>的子集合，\
-  該清單包含自動建立，只在某些專案上 Commit 東西的使用者，這類使用者不能直接使用 Jenkins。
 User\ Id=使用者識別碼
 Name=名稱
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
index 83f9eef9ec..9aad719b12 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signupWithFederatedIdentity.jelly
@@ -27,5 +27,5 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm">
-  <local:_entryFormPage host="${app}" title="${%Sign up}" action="createAccountWithFederatedIdentity" captcha="${true}" data="${data}" />
+  <local:_entryFormPage host="${app}" title="${%Sign up}" action="createAccountWithFederatedIdentity" data="${data}" />
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
index e54fd011a6..694938ff7e 100644
--- a/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
+++ b/core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser.jelly
@@ -5,7 +5,7 @@
     <l:main-panel>
      <div class="create-admin-user">
        <form action="${rootURL}/setupWizard/createAdminUser" method="post">
-          <local:_entryForm it="${app.securityRealm}" host="${app.securityRealm}" title="${%Create First Admin User}" captcha="${false}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
+          <local:_entryForm it="${app.securityRealm}" host="${app.securityRealm}" title="${%Create First Admin User}" xmlns:local="/hudson/security/HudsonPrivateSecurityRealm" />
        </form>
      </div>
     </l:main-panel>
diff --git a/src/main/js/components/dialogs/index.js b/src/main/js/components/dialogs/index.js
index 7e3582adcf..f1913a5ce4 100644
--- a/src/main/js/components/dialogs/index.js
+++ b/src/main/js/components/dialogs/index.js
@@ -331,6 +331,12 @@ function init() {
       let dialog = new Dialog("form", options);
       return dialog.show();
     },
+
+    wizard: function (initialUrl, options) {
+      dialog.modal(document.createElement("template"), options);
+
+      navigateToNextPage(initialUrl, "");
+    },
   };
 
   behaviorShim.specify(
@@ -339,7 +345,14 @@ function init() {
     1000,
     (element) => {
       element.addEventListener("click", () => {
-        renderOnDemandDialog(element.dataset.dialogId);
+        if (element.dataset.dialogUrl != null) {
+          window.dialog.wizard(element.dataset.dialogUrl, {
+            minWidth: "min(550px, 100vw)",
+            preventCloseOnOutsideClick: true,
+          });
+        } else {
+          renderOnDemandDialog(element.dataset.dialogId);
+        }
       });
     },
   );
@@ -357,4 +370,201 @@ function init() {
   }
 }
 
+function updateWizardTitle(titleText) {
+  if (titleText == null) {
+    return;
+  }
+
+  const title = document.querySelector(
+    ".jenkins-dialog .jenkins-dialog__title > span",
+  );
+  if (title != null) {
+    title.textContent = titleText;
+  }
+}
+
+/** Resolve a relative wizard form action against the current step URL. */
+function resolveWizardFormAction(form, baseUrl) {
+  const formAction = form.getAttribute("action");
+  if (
+    formAction &&
+    !formAction.startsWith("/") &&
+    !formAction.startsWith("http")
+  ) {
+    form.action = new URL(formAction, baseUrl).toString();
+  }
+}
+
+function submitWizardForm(form) {
+  const jsonInputName = "json";
+  let jsonInput = form.elements.namedItem(jsonInputName);
+
+  if (jsonInput == null) {
+    jsonInput = document.createElement("input");
+    jsonInput.type = "hidden";
+    jsonInput.name = jsonInputName;
+    form.appendChild(jsonInput);
+  }
+
+  buildFormTree(form);
+
+  let body = new FormData(form);
+  const hasFileInput = Array.from(form.elements).some(
+    (element) => element instanceof HTMLInputElement && element.type === "file",
+  );
+
+  if (!hasFileInput) {
+    body = new URLSearchParams(body);
+  }
+
+  fetch(form.action, {
+    method: form.method.toUpperCase(),
+    headers: crumb.wrap({}),
+    body: body,
+  }).then((rsp) => {
+    if (rsp.redirected) {
+      window.location.assign(rsp.url);
+      return;
+    }
+
+    rsp.text().then((responseText) => {
+      const replacementForm = renderWizardForm({
+        responseText,
+        requestUrl: rsp.url,
+        titleText: rsp.headers.get("X-Dialog-Title"),
+        replaceExistingForm: form,
+      });
+
+      if (replacementForm == null) {
+        window.location.assign(rsp.url);
+      }
+    });
+  });
+}
+
+function configureWizardForm(form) {
+  form.addEventListener("submit", (e) => {
+    e.preventDefault();
+    submitWizardForm(e.currentTarget);
+  });
+}
+
+function renderWizardForm({
+  responseText,
+  requestUrl,
+  titleText,
+  replaceExistingForm = null,
+  hideExistingForms = false,
+}) {
+  const dialogContents = document.querySelector(
+    ".jenkins-dialog .jenkins-dialog__contents",
+  );
+  const newDialog = document.createElement("div");
+  newDialog.innerHTML = responseText;
+
+  const form = newDialog.querySelector("form");
+  if (form == null) {
+    return null;
+  }
+
+  if (hideExistingForms) {
+    Array.from(dialogContents.children)
+      .filter((element) => element.tagName === "FORM")
+      .forEach((existingForm) => existingForm.classList.add("jenkins-hidden"));
+  }
+
+  resolveWizardFormAction(form, requestUrl);
+  updateWizardTitle(titleText);
+  configureWizardForm(form);
+
+  // Recreate script tags while the form is still detached, so each script
+  // executes exactly once, at the moment the form is inserted into the dialog.
+  recreateScripts(form);
+
+  if (replaceExistingForm != null) {
+    replaceExistingForm.replaceWith(form);
+  } else {
+    dialogContents.appendChild(form);
+  }
+
+  wireCancelButton(form);
+
+  return form;
+}
+
+function wireCancelButton(form) {
+  const dialog = form.closest("dialog");
+  form.querySelector("[data-id=cancel]")?.addEventListener("click", (e) => {
+    e.preventDefault();
+    dialog?.dispatchEvent(new Event("cancel"));
+  });
+}
+
+function navigateToNextPage(url) {
+  fetch(url, {
+    method: "GET",
+    headers: crumb.wrap({}),
+  }).then((rsp) => {
+    if (rsp.ok) {
+      rsp.text().then((responseText) => {
+        const form = renderWizardForm({
+          responseText,
+          requestUrl: rsp.url,
+          titleText: rsp.headers.get("X-Dialog-Title"),
+          hideExistingForms: true,
+        });
+
+        if (form == null) {
+          window.location.assign(rsp.url);
+        }
+      });
+    } else {
+      console.error(
+        "Failed to load dialog content, response from API is:",
+        rsp,
+      );
+    }
+  });
+}
+
+/*
+ * Recreate script tags to ensure they are executed, as innerHTML does not execute scripts.
+ *
+ */
+function recreateScripts(form) {
+  const scripts = Array.from(form.getElementsByTagName("script"));
+  if (scripts.length === 0) {
+    Behaviour.applySubtree(form, true);
+    return;
+  }
+  for (let i = 0; i < scripts.length; i++) {
+    const original = scripts[i];
+    const script = document.createElement("script");
+
+    for (let j = 0; j < original.attributes.length; j++) {
+      script.setAttribute(
+        original.attributes[j].name,
+        original.attributes[j].value,
+      );
+    }
+    if (original.text) {
+      script.text = original.text;
+    }
+
+    // only attach the load listener to the last script to avoid multiple calls to Behaviour.applySubtree
+    if (i === scripts.length - 1) {
+      script.addEventListener("load", () => {
+        setTimeout(() => {
+          Behaviour.applySubtree(form, true);
+          if (form.method.toLowerCase() !== "get") {
+            form.onsubmit = null; // clear any existing handler
+          }
+        }, 50);
+      });
+    }
+
+    original.parentNode.replaceChild(script, original);
+  }
+}
+
 export default { init };
diff --git a/src/main/scss/components/_dialogs.scss b/src/main/scss/components/_dialogs.scss
index d28e9d6e76..0b9cca70c8 100644
--- a/src/main/scss/components/_dialogs.scss
+++ b/src/main/scss/components/_dialogs.scss
@@ -14,6 +14,7 @@ $jenkins-dialog-padding: 1.25rem;
   padding: 0;
   display: flex;
   flex-direction: column;
+  color: var(--text-color);
 
   // Thin highlight for dark themes to differentiate the dialog from its backdrop
   outline: 1px solid rgb(255 255 255 / 0.05);