diff --git a/openid-connect-server/src/main/webapp/resources/js/client.js b/openid-connect-server/src/main/webapp/resources/js/client.js
index deda485b0..3f5f75ef1 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -370,6 +370,8 @@ var ClientFormView = Backbone.View.extend({
             policyUri: $('#policyUri input').val(),
             clientUri: $('#clientUri input').val(),
             applicationType: $('#applicationType input').filter(':checked').val(),
+            jwksUri: $('#jwksUri input').val(),
+            subjectType: subjectType, // TODO: need a preprocessor?
             
             
             
@@ -377,9 +379,7 @@ var ClientFormView = Backbone.View.extend({
             contacts: this.contactsCollection.pluck('item'),
             tokenEndpointAuthMethod: $('#tokenEndpointAuthMethod input').val(), // TODO: this might need to be something different for a single-select?
             responseTypes: responseTypes, // TODO: need a preprocessor?
-            jwksUri: $('#jwksUri input').val(),
             sectorIdentifierUri: $('#sectorIdentifierUri input').val(),
-            subjectType: subjectType, // TODO: need a preprocessor?
             requestObjectSigningAlg: requestObjectSigningAlg,           // TODO: need a preprocessor for all the JOSE stuff:
             userInfoEncryptedResponseAlg: userInfoEncryptedResponseAlg, // "
             userInfoEncryptedResponseEnc: userInfoEncryptedResponseEnc, // "
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 04d03bf75..7764955bb 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -76,6 +76,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-other-tab" data-toggle="tab" href="#">Other</a></li>
 				</ul>
 
 <div class="tab-content">
@@ -270,6 +271,14 @@
 
 			</div>
 
+			<div class="control-group" id="jwksUri">
+				<label class="control-label">JWK Set</label>
+				<div class="controls">
+					<input placeholder="http://" value="<%=jwksUri%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">URL for the client's JSON Web Key set</p>
+				</div>
+			</div>
+
 	</div>
 
 	<div class="tab-pane" id="client-token-tab">
@@ -331,9 +340,19 @@
 
 	<div class="tab-pane" id="client-other-tab">
 
-		<div class="alert alert-block alert-info">
-			This page intentionally left blank.
-		</div>
+			<div class="control-group" id="subjectType">
+				<label class="control-label">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>