diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
index 02c43b5764d0..e1f512a3f46f 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/Details/config.jelly
@@ -24,10 +24,10 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-    <f:entry title="${%Password}:">
-      <input name="user.password" type="password" value="${instance.protectedPassword}" />
+    <f:entry title="${%Password}">
+      <input class="jenkins-input" name="user.password" type="password" value="${instance.protectedPassword}" />
     </f:entry>
-    <f:entry title="${%Confirm Password}:">
-      <input name="user.password2" type="password" value="${instance.protectedPassword}" />
+    <f:entry title="${%Confirm Password}">
+      <input class="jenkins-input" name="user.password2" type="password" value="${instance.protectedPassword}" />
     </f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
index 3a0bd5627b17..e30c8fcf8931 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/_entryForm.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <!-- tag file used by both signup.jelly and addUser.jelly -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" >
   <st:documentation>
     <st:attribute name="it" use="required" type="hudson.security.HudsonPrivateSecurityRealm">
       Context where the page is loaded.
@@ -43,50 +43,50 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <h1>${title}</h1>
-  <div class="form-content">
-    <j:if test="${data.errorMessage!=null}">
-      <div class="error">
-        ${data.errorMessage}
-      </div>
-    </j:if>
-    <j:forEach var="error" items="${data.errors}">
-      <div class="error">
-        ${error.value}
-      </div>
-    </j:forEach>
-      <table>
-        <tr>
-          <td>${%Username}:</td>
-          <td><input type="text" name="username" id="username" value="${data.username}" autofocus="autofocus" /></td>
-        </tr>
-        <tr>
-          <td>${%Password}:</td>
-          <td><input type="password" name="password1" value="${data.password1}" /></td>
-        </tr>
-        <tr>
-          <td>${%Confirm password}:</td>
-          <td><input type="password" name="password2" value="${data.password2}" /></td>
-        </tr>
-        <tr>
-          <td>${%Full name}:</td>
-          <td><input type="text" name="fullname" value="${data.fullname}" /></td>
-        </tr>
-        <j:if test="${it.mailerPluginPresent}">
-          <tr>
-            <td>${%E-mail address}:</td>
-            <td><input type="text" name="email" value="${data.email}" /></td>
-          </tr>
-        </j:if>
-        <j:if test="${captcha}">
-          <tr>
-            <td>${%Enter text as shown}:</td>
-            <td>
-              <input type="text" name="captcha" autocomplete="off" /><br />
-              <img src="${rootURL}/securityRealm/captcha" alt="[${%captcha}]" />
-            </td>
-          </tr>
-        </j:if>
-      </table>
+  <div class="jenkins-app-bar">
+    <div class="jenkins-app-bar__content">
+      <h1>${title}</h1>
+    </div>
   </div>
+
+  <j:if test="${data.errorMessage!=null}">
+    <div class="error">
+      ${data.errorMessage}
+    </div>
+  </j:if>
+
+  <j:forEach var="error" items="${data.errors}">
+    <div class="error">
+      ${error.value}
+    </div>
+  </j:forEach>
+
+  <f:entry title="${%Username}">
+    <f:textbox name="username" value="${data.username}" autofocus="true" />
+  </f:entry>
+
+  <f:entry title="${%Password}">
+    <input class="jenkins-input" type="password" name="password1" value="${data.password1}" />
+  </f:entry>
+
+  <f:entry title="${%Confirm password}">
+    <input class="jenkins-input" type="password" name="password2" value="${data.password2}" />
+  </f:entry>
+
+  <f:entry title="${%Full name}">
+    <f:textbox name="fullname" value="${data.fullname}" />
+  </f:entry>
+
+  <j:if test="${it.mailerPluginPresent}">
+    <f:entry title="${%Email address}">
+      <f:textbox name="email" value="${data.email}" />
+    </f:entry>
+  </j:if>
+
+  <j:if test="${captcha}">
+    <f:entry title="${%Enter text as shown}">
+        <input class="jenkins-input" type="text" name="captcha" autocomplete="off" /><br />
+        <img src="${rootURL}/securityRealm/captcha" alt="[${%captcha}]" />
+    </f:entry>
+  </j:if>
 </j:jelly>