diff --git a/lib/conf/cli.js b/lib/conf/cli.js
index <HASH>..<HASH> 100644
--- a/lib/conf/cli.js
+++ b/lib/conf/cli.js
@@ -63,6 +63,11 @@ var start = function(cb) {
   // account
   cli.command('account', 'Prey account management.', function(sub) {
 
+    sub.command('setup', 'Starts interactive command-line account setup.', function(cmd) {
+      cmd.options(['-f', '--force'], 'Force setup even if API key is already set.')
+      run_if_writable(cmd, account.setup);
+    });
+
     sub.command('authorize', 'Validates auth credentials, and stores API key if authorized.', function(cmd) {
       cmd.parameters(['-a', '--api-key'], 'API Key')
       cmd.parameters(['-e', '--email'], 'Email')
@@ -86,11 +91,6 @@ var start = function(cb) {
       run_if_writable(cmd, account.signup);
     });
 
-    sub.command('setup', 'Starts interactive command-line account setup.', function(cmd) {
-      cmd.options(['-f', '--force'], 'Force setup even if API key is already set.')
-      run_if_writable(cmd, account.setup);
-    });
-
     sub.start();
   })
Conf/cli: Move 'setup' to top of config account section.