--- a/cmd/gondole-cli/main.go	Wed Apr 12 22:26:52 2017 +0200
+++ b/cmd/gondole-cli/main.go	Wed Apr 12 22:31:21 2017 +0200
@@ -76,7 +76,15 @@
 
 	// Load configuration, will register if none is found
 	cnf, err = LoadConfig(instanceName)
-	if err != nil {
+	if err == nil && cnf != nil {
+		instance = &gondole.Client{
+			ID:          cnf.ID,
+			InstanceURL: cnf.InstanceURL,
+			APIBase:     cnf.APIBase,
+			Name:        cnf.Name,
+			Secret:      cnf.BearerToken,
+		}
+	} else {
 		// Nothing exist yet
 		/*
 			defName := Config{