diff --git a/client/graphql.go b/client/graphql.go
index 0f0de576717e4f0c415c034c02cd017a16430dd5..f4f47388951138413d633230cabee76e4252271c 100644
--- a/client/graphql.go
+++ b/client/graphql.go
@@ -31,8 +31,11 @@ 		panic(err) // Programmer error
 	}
 
 	conf := config.ForContext(ctx)
-	origin, ok := conf.Get(svc, "origin")
-	if !ok {
+	origin, _ := conf.Get(svc, "api-origin")
+	if origin == "" {
+		origin = config.GetOrigin(conf, svc, false)
+	}
+	if origin == "" {
 		panic(fmt.Errorf("No %s origin specified in config.ini", svc))
 	}