diff --git a/app.go b/app.go
index 6345564e..e5110ffb 100644
--- a/app.go
+++ b/app.go
@@ -95,6 +95,8 @@ func run(args options) {
 		os.Exit(0)
 	}()
 
+	clientsInit()
+
 	if !config.firstRun {
 		// Do the upgrade if necessary
 		err := upgradeConfig()
diff --git a/config.go b/config.go
index 65bf8025..78589f04 100644
--- a/config.go
+++ b/config.go
@@ -220,7 +220,6 @@ func parseConfig() error {
 		return err
 	}
 
-	clientsInit()
 	for _, cy := range config.Clients {
 		cli := Client{
 			Name:                cy.Name,