diff --git a/lib/commands/client.js b/lib/commands/client.js
index ff5553b..1b75535 100644
--- a/lib/commands/client.js
+++ b/lib/commands/client.js
@@ -158,6 +158,7 @@ function registerClient (cli, options, done) {
                       answers.response_types.indexOf('code') !== -1 ||
                       answers.response_types.indexOf('code id_token token') !== -1
                     ) {
+                      choices[0].checked = true
                       choices[0].disabled = 'Required for code response type'
                     }
                     if (
@@ -499,6 +500,7 @@ function registerClient (cli, options, done) {
                         answers.response_types.indexOf('code') !== -1 ||
                         answers.response_types.indexOf('code id_token token') !== -1
                       ) {
+                        choices[0].checked = true
                         choices[0].disabled = 'Required for code response type'
                       }
                       if (