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 f7371ef5a..842f9c3ae 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -360,9 +360,9 @@
                         	<input type="checkbox" id="disableAccessTokenTimeout" <%=(accessTokenValiditySeconds == null ? 'checked' : '')%>/> Access tokens do not time out
 						</label>
 					</div>
-                    <div class="input-append">
-                        <input type="text" class="" value="<%=(accessTokenValiditySeconds == null ? '' : accessTokenValiditySeconds)%>" id="access-token-timeout-seconds" size="16">
-						<select>
+                    <div class="form-horizontal">
+                        <input type="text" class="" value="<%=(accessTokenValiditySeconds == null ? '' : accessTokenValiditySeconds)%>" id="access-token-timeout-seconds" size="16" style="width:120px;">
+						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>
 							<option>hours</option>
@@ -381,9 +381,9 @@
                         	<input type="checkbox" id="disableIDTokenTimeout" <%=(idTokenValiditySeconds == null ? 'checked' : '')%>/> ID Tokens do not time out
 						</label>
 					</div>
-                    <div class="input-append">
-                        <input type="text" class="" value="<%=(idTokenValiditySeconds == null ? '' : idTokenValiditySeconds)%>" id="id-token-timeout-seconds" size="16">
-						<select>
+                    <div class="form-horizontal">
+                        <input type="text" class="" value="<%=(idTokenValiditySeconds == null ? '' : idTokenValiditySeconds)%>" id="id-token-timeout-seconds" size="16" style="width:120px;">
+						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>
 							<option>hours</option>
@@ -414,9 +414,9 @@
                         	<input type="checkbox" id="disableRefreshTokenTimeout" <%=(refreshTokenValiditySeconds == null ? 'checked' : '')%>/> Refresh tokens do not time out
 						</label>
 					</div>
-                    <div class="input-append">
-                        <input type="text" class="" value="<%=(refreshTokenValiditySeconds == null ? '' : refreshTokenValiditySeconds)%>" id="refresh-token-timeout-seconds" size="16">
-						<select>
+                    <div class="form-horizontal">
+                        <input type="text" class="" value="<%=(refreshTokenValiditySeconds == null ? '' : refreshTokenValiditySeconds)%>" id="refresh-token-timeout-seconds" size="16" style="width:120px;">
+						<select style="width:120px;">
 							<option>seconds</option>
 							<option>minutes</option>
 							<option>hours</option>