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 ede77db30..5675e0294 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -106,11 +106,7 @@
                                       rows="3"><%=clientDescription%></textarea> <span class="help-inline"></span>
                             </span>
 
-                            <span class="control-group" id="clientSecret">
-                            <label>Client Secret</label>
-                            <input value="<%=clientSecret%>" maxlength="100" type="text" class=""
-                                   placeholder="Type a secret"> <span class="help-inline">If you leave this blank a client secret will be generated for you automatically.</span>
-                            </span>
+
                         </div>
                     </div>
 
@@ -132,51 +128,23 @@
 
                 <div class="row-fluid">
 
-                    <div class="span4 control-group">
+                    <div class="span4 control-group" id="scope">
 
-                        <label class="control-label">Grant Types</label>
+                        <label class="control-label">Scope</label>
 
-                        <div class="controls">
-                            <label class="checkbox">
-                                <input type="checkbox" name="grant-type-checkbox-list1" value="option1">
-                                Option one
-                            </label>
-                            <label class="checkbox">
-                                <input type="checkbox" name="grant-type-checkbox-list2" value="option2">
-                                Option two
-                            </label>
-                            <label class="checkbox">
-                                <input type="checkbox" name="grant-type-checkbox-list3" value="option3">
-                                Option three
-                            </label>
-
-                            <p class="help-block"><strong>Note:</strong> Labels surround all the options for
-                                much larger click areas and a more usable form.</p>
-                        </div>
+                        <textarea rows="3" class="xlarge" placeholder="openid"
+                                  id="textarea2" name="textarea2"><% for (var i in scope) { %><%=scope[i]+","%><% }%></textarea>
+                          <span class="help-block">
+                            Please enter scopes separated by commas
+                          </span>
 
                     </div>
 
-                    <div class="span4 control-group">
+                    <div class="span4 control-group" id="clientSecret">
 
-                        <label class="control-label">Auth Types</label>
-
-                        <div class="controls">
-                            <label class="checkbox">
-                                <input type="checkbox" name="auth-type-checkbox-list1" value="option1">
-                                Option one
-                            </label>
-                            <label class="checkbox">
-                                <input type="checkbox" name="auth-type-checkbox-list2" value="option2">
-                                Option two
-                            </label>
-                            <label class="checkbox">
-                                <input type="checkbox" name="auth-type-checkbox-list3" value="option3">
-                                Option three
-                            </label>
-
-                            <p class="help-block"><strong>Note:</strong> Labels surround all the options for
-                                much larger click areas and a more usable form.</p>
-                        </div>
+                        <label>Client Secret</label>
+                        <input value="<%=clientSecret%>" maxlength="100" type="text" class=""
+                               placeholder="Type a secret"> <span class="help-inline">If you leave this blank a client secret will be generated for you automatically.</span>
 
                     </div>
 
@@ -207,20 +175,6 @@
                         </span>
                     </div>
 
-
-                    <div id="scope" class="span12 control-group">
-                        <label for="textarea2">Scope</label>
-
-                        <div class="input">
-                            <textarea rows="3" class="xlarge span10" placeholder="openid"
-                                      id="textarea2" name="textarea2"><% for (var i in scope) { %><%=scope[i]+","%><% } %></textarea>
-              <span class="help-block">
-                Please enter scopes separated by commas
-              </span>
-                        </div>
-                    </div>
-
-
                 </div>
             </fieldset>
         </form>