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 042f1b16b..deda485b0 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -364,9 +364,12 @@ var ClientFormView = Backbone.View.extend({
             allowRefresh: $('#allowRefresh').is(':checked'), // TODO: why are these two checkboxes different?
             allowIntrospection: $('#allowIntrospection input').is(':checked'), // <-- And here? --^
             scope: scopes,
+            
+            // TODO: items below this line are untested
             tosUri: $('#tosUri input').val(),
             policyUri: $('#policyUri input').val(),
             clientUri: $('#clientUri input').val(),
+            applicationType: $('#applicationType input').filter(':checked').val(),
             
             
             
@@ -375,7 +378,6 @@ var ClientFormView = Backbone.View.extend({
             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(),
-            applicationType: applicationType, // TODO: need a preprocessor?
             sectorIdentifierUri: $('#sectorIdentifierUri input').val(),
             subjectType: subjectType, // TODO: need a preprocessor?
             requestObjectSigningAlg: requestObjectSigningAlg,           // TODO: need a preprocessor for all the JOSE stuff:
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 f7c1d7990..3b4539d18 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -151,6 +151,19 @@
 				</div>
 			</div>
 
+			<div class="control-group" id="applicationType">
+				<label class="control-label">Application Type</label>
+				<div class="controls">
+					<label class="radio inline">
+						<input type="radio" name="applicationType" value="NATIVE" <%=applicationType == 'NATIVE' ? 'checked' : ''%> Native
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="applicationType" value="WEB" <%=applicationType == 'WEB' ? 'checked' : ''%> Native
+					</label>
+				</div>
+			</div>
+			
+