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 7a8d9f681..4d4a99cb7 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -372,13 +372,13 @@ var ClientFormView = Backbone.View.extend({
             applicationType: $('#applicationType input').filter(':checked').val(),
             jwksUri: $('#jwksUri input').val(),
             subjectType: $('#applicationType input').filter(':checked').val(),
+            tokenEndpointAuthMethod: $('#tokenEndpointAuthMethod input').filter(':checked').val(),
             
             
             
             // TODO: everything below this line isn't implemented yet
             /*
             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?
             sectorIdentifierUri: $('#sectorIdentifierUri input').val(),
             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 7764955bb..fbac1887c 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -227,6 +227,27 @@
 	
 	<div class="tab-pane" id="client-secret-tab">
 
+			<div class="control-group" id="tokenEndpointAuthMethod">
+				<label class="control-label">Token Endpoint Authentication Method</label>
+				<div class="controls">
+					<label class="radio inline">
+						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_BASIC" <%=(tokenEndpointAuthMethod == 'SECRET_BASIC' ? 'checked' : '')%>> Client Secret over HTTP Basic
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_POST" <%=(tokenEndpointAuthMethod == 'SECRET_POST' ? 'checked' : '')%>> Client Secret over HTTP POST
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="tokenEndpointAuthMethod" value="SECRET_JWT" <%=(tokenEndpointAuthMethod == 'SECRET_JWT' ? 'checked' : '')%>> Client Secret via symmetrically-signed JWT assertion
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="tokenEndpointAuthMethod" value="PRIVATE_KEY_JWT" <%=(tokenEndpointAuthMethod == 'PRIVATE_KEY_JWT' ? 'checked' : '')%>> Asymmetrically-signed JWT assertion
+					</label>
+					<label class="radio inline">
+						<input type="radio" name="tokenEndpointAuthMethod" value="NONE" <%=(tokenEndpointAuthMethod == 'NONE' ? 'checked' : '')%>> No authentication
+					</label>
+				</div>
+			</div>
+
 			<div class="control-group" id="requireClientSecret">
 				<label class="control-label">Client Secret</label>
 				<div class="controls">
@@ -257,13 +278,13 @@
 	
     	        <div class="control-group">
             	    <div class="controls">
-						<div id="clientSecret">
+						<div id="clientSecret" class="span3">
                 	    	<input value="<%=clientSecret%>" maxlength="100" type="text" placeholder="Type a secret">
 						</div>
-						<div id="clientSecretGenerated">
-							<span class="uneditable-input span3">Generate on Save</span>
+						<div id="clientSecretGenerated" class="span3">
+							<span class="uneditable-input">Generate on Save</span>
 						</div>
-						<div id="clientSecretHidden"> 
+						<div id="clientSecretHidden" class="span3"> 
 							<span class="uneditable-input span3">* * * * * * * * * * * *</span>
 						</div>
 	                </div>