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 3358b7704..200ccf11c 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -273,6 +273,27 @@
 					</label>
 				</div>
 			</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 class="control-group" id="sectorIdentifierUri">
+				<label class="control-label">Sector Identifier URI</label>
+				<div class="controls">
+					<input placeholder="http://" value="<%=sectorIdentifierUri%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">Sector Identifier for JavaScript</p>
+				</div>
+			</div>
+
 	</div>
 	
 	<div class="tab-pane" id="client-secret-tab">
@@ -549,18 +570,6 @@
 
 	<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">
@@ -605,17 +614,7 @@
                 <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">
-					<input placeholder="http://" value="<%=sectorIdentifierUri%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">Sector Identifier for JavaScript</p>
-				</div>
-			</div>
-
-			
+            </div>			
 
 	</div>
 
diff --git a/openid-connect-server/src/main/webapp/resources/template/dynreg.html b/openid-connect-server/src/main/webapp/resources/template/dynreg.html
index 067a8241f..eaa37d694 100644
--- a/openid-connect-server/src/main/webapp/resources/template/dynreg.html
+++ b/openid-connect-server/src/main/webapp/resources/template/dynreg.html
@@ -295,6 +295,27 @@
 					</label>
 				</div>
 			</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" <%=(client.subject_type == 'public' ? 'checked' : '')%>> Public
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="subjectType" value="pairwise" <%=(client.subject_type == 'pairwise' ? 'checked' : '')%>> Pairwise
+					</label>
+				</div>
+			</div>
+
+			<div class="control-group" id="sectorIdentifierUri">
+				<label class="control-label">Sector Identifier URI</label>
+				<div class="controls">
+					<input placeholder="http://" value="<%=client.sector_identifier_uri ? client.sector_identifier_uri : ''%>" maxlength="1000" type="text" class=""/>
+					<p class="help-block">Sector Identifier for JavaScript</p>
+				</div>
+			</div>
+
 	</div>
 	
 	<div class="tab-pane" id="client-secret-tab">
@@ -456,18 +477,6 @@
 
 	<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" <%=(client.subject_type == 'public' ? 'checked' : '')%>> Public
-					</label>
-					<label class="radio inline">
-						<input type="radio" name="subjectType" value="pairwise" <%=(client.subject_type == '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">
@@ -514,14 +523,6 @@
                 </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">
-					<input placeholder="http://" value="<%=client.sector_identifier_uri ? client.sector_identifier_uri : ''%>" maxlength="1000" type="text" class=""/>
-					<p class="help-block">Sector Identifier for JavaScript</p>
-				</div>
-			</div>
-
 			
 
 	</div>