diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index 879d60dab..3358b7704 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -97,6 +97,7 @@
 					<li><a data-target="#client-access-tab" data-toggle="tab" href="#">Access</a></li>
 					<li><a data-target="#client-secret-tab" data-toggle="tab" href="#">Credentials</a></li>
 					<li><a data-target="#client-token-tab" data-toggle="tab" href="#">Tokens</a></li>
+					<li><a data-target="#client-crypto-tab" data-toggle="tab" href="#">Crypto</a></li>
 					<li><a data-target="#client-other-tab" data-toggle="tab" href="#">Other</a></li>
 				</ul>
 
@@ -422,66 +423,7 @@
             </div>
 	</div>
 
-	<div class="tab-pane" id="client-other-tab">
-
-			<div class="control-group" id="subjectType">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Subject Type</label>
-				<div class="controls">
-					<label class="radio inline">
-						<input type="radio" name="subjectType" value="PUBLIC" <%=(subjectType == 'PUBLIC' ? 'checked' : '')%>> Public
-					</label>
-					<label class="radio inline">
-						<input type="radio" name="subjectType" value="PAIRWISE" <%=(subjectType == 'PAIRWISE' ? 'checked' : '')%>> Pairwise
-					</label>
-				</div>
-			</div>
-
-			<div class="control-group" id="initiateLoginUri">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Initiate Login</label>
-				<div class="controls">
-					<input placeholder="http://" value="<%=initiateLoginUri%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL to initiate login on the client</p>
-				</div>
-			</div>
-
-			<div class="control-group" id="postLogoutRedirectUri">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Post-Logout Redirect</label>
-				<div class="controls">
-					<input placeholder="http://" value="<%=postLogoutRedirectUri%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">URL to redirect the client to after a logout operation</p>
-				</div>
-			</div>
-
-
-            <div class="control-group" id="requireAuthTime">
-                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Require Auth Time</label>
-                <div class="controls">
-                    <label class="checkbox">
-                        <input type="checkbox" <%=(requireAuthTime == true ? 'checked' : '')%>> Always require that the auth_time claim be sent in the id token
-                    </label>
-                </div>
-            </div>
-
-			<div class="control-group" id="defaultMaxAge">
-				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Default Max Age</label>
-				<div class="controls">
-					<input placeholder="" value="<%=defaultMaxAge%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">Default maximum session age before re-prompting</p>
-				</div>
-			</div>
-
-            <div class="control-group" id="requestUris">
-                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Request URIs</label>
-                <div class="controls">
-                </div>
-            </div>
-
-            <div class="control-group" id="defaultAcrValues">
-                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Default ACR Values</label>
-                <div class="controls">
-                </div>
-            </div>
-
+	<div class="tab-pane" id="client-crypto-tab">
             <div class="control-group" id="requestObjectSigningAlg">
                 <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Request Object Signing Algorithm</label>
                 <div class="controls">
@@ -603,6 +545,68 @@
 				</div>
 			</div>
 
+	</div>
+
+	<div class="tab-pane" id="client-other-tab">
+
+			<div class="control-group" id="subjectType">
+				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Subject Type</label>
+				<div class="controls">
+					<label class="radio inline">
+						<input type="radio" name="subjectType" value="PUBLIC" <%=(subjectType == 'PUBLIC' ? 'checked' : '')%>> Public
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="subjectType" value="PAIRWISE" <%=(subjectType == 'PAIRWISE' ? 'checked' : '')%>> Pairwise
+					</label>
+				</div>
+			</div>
+
+			<div class="control-group" id="initiateLoginUri">
+				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Initiate Login</label>
+				<div class="controls">
+					<input placeholder="http://" value="<%=initiateLoginUri%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">URL to initiate login on the client</p>
+				</div>
+			</div>
+
+			<div class="control-group" id="postLogoutRedirectUri">
+				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Post-Logout Redirect</label>
+				<div class="controls">
+					<input placeholder="http://" value="<%=postLogoutRedirectUri%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">URL to redirect the client to after a logout operation</p>
+				</div>
+			</div>
+
+
+            <div class="control-group" id="requireAuthTime">
+                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Require Auth Time</label>
+                <div class="controls">
+                    <label class="checkbox">
+                        <input type="checkbox" <%=(requireAuthTime == true ? 'checked' : '')%>> Always require that the auth_time claim be sent in the id token
+                    </label>
+                </div>
+            </div>
+
+			<div class="control-group" id="defaultMaxAge">
+				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Default Max Age</label>
+				<div class="controls">
+					<input placeholder="" value="<%=defaultMaxAge%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">Default maximum session age before re-prompting</p>
+				</div>
+			</div>
+
+            <div class="control-group" id="requestUris">
+                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Request URIs</label>
+                <div class="controls">
+                </div>
+            </div>
+
+            <div class="control-group" id="defaultAcrValues">
+                <label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Default ACR Values</label>
+                <div class="controls">
+                </div>
+            </div>
+
 			<div class="control-group" id="sectorIdentifierUri">
 				<label class="control-label"><span class="label label-default nyi"><i class="icon-road icon-white"></i> NYI </span> Sector Identifier URI</label>
 				<div class="controls">