 
       when "serve"
 
-        servePort = (@port || 13101)
+        @port = if argv.port
+          argv.port
+        else
+          4000
+
+        servePort = @port
         url = "http://localhost:#{servePort}"
 
         WebServer = require "./steroids/servers/WebServer"

      when "connect"
        updater = new Updater
        updater.check()

        portscanner = require "portscanner"



        util.log "Starting login process"

        @port = if argv.port
          argv.port
        else
          13303

        server = @startServer
          port: @port
          callback: ()=>
            login = new Login
              server: server
              port: @port
            login.authorize()

      when "logout"
