diff --git a/coordinator/core/legacy_test.go b/coordinator/core/legacy_test.go
index ffd92424e..cb552fabe 100644
--- a/coordinator/core/legacy_test.go
+++ b/coordinator/core/legacy_test.go
@@ -80,8 +80,8 @@ func TestLegacyActivateCoordinator(t *testing.T) {
 	assert.NoError(err)
 
 	// Coordinator streams admin conf
-	require.Equal(4, len(testActivationSvr.sent))
-	adminConfig := testActivationSvr.sent[3].GetAdminConfig()
+	require.NotEmpty(testActivationSvr.sent)
+	adminConfig := testActivationSvr.sent[len(testActivationSvr.sent)-1].GetAdminConfig()
 	require.NotNil(adminConfig)
 	assert.NotEmpty(adminConfig.AdminVpnIp)
 	assert.Equal(coordinatorKey, adminConfig.CoordinatorVpnPubKey)
@@ -92,7 +92,6 @@ func TestLegacyActivateCoordinator(t *testing.T) {
 
 	// Coordinator cannot be activated a second time
 	assert.Error(coordinatorAPI.ActivateAsCoordinator(activationReq, testActivationSvr))
-	assert.Equal(4, len(testActivationSvr.sent))
 
 	// Node cannot be activated a second time
 	nodeResp, err := nodeAPI3.ActivateAsNode(context.TODO(), &pubproto.ActivateAsNodeRequest{
diff --git a/coordinator/pubapi/coord.go b/coordinator/pubapi/coord.go
index a4d51fde0..0d47733df 100644
--- a/coordinator/pubapi/coord.go
+++ b/coordinator/pubapi/coord.go
@@ -29,6 +29,18 @@ func (a *API) ActivateAsCoordinator(in *pubproto.ActivateAsCoordinatorRequest, s
 		return status.Error(codes.InvalidArgument, "missing master secret")
 	}
 
+	logToCLI := a.newLogToCLIFunc(func(msg string) error {
+		return srv.Send(&pubproto.ActivateAsCoordinatorResponse{
+			Content: &pubproto.ActivateAsCoordinatorResponse_Log{
+				Log: &pubproto.Log{
+					Message: msg,
+				},
+			},
+		})
+	})
+
+	logToCLI("Initializing first Coordinator ...")
+
 	// If any of the following actions fail, we cannot revert
 	// Thus, mark this peer as failed.
 	defer func() {
@@ -70,6 +82,7 @@ func (a *API) ActivateAsCoordinator(in *pubproto.ActivateAsCoordinatorRequest, s
 		return status.Errorf(codes.Internal, "%v", err)
 	}
 
+	logToCLI("Initializing Kubernetes ...")
 	kubeconfig, err := a.core.InitCluster(in.AutoscalingNodeGroups, in.CloudServiceAccountUri)
 	if err != nil {
 		return status.Errorf(codes.Internal, "%v", err)
@@ -87,16 +100,6 @@ func (a *API) ActivateAsCoordinator(in *pubproto.ActivateAsCoordinatorRequest, s
 		}
 	}()
 
-	logToCLI := a.newLogToCLIFunc(func(msg string) error {
-		return srv.Send(&pubproto.ActivateAsCoordinatorResponse{
-			Content: &pubproto.ActivateAsCoordinatorResponse_Log{
-				Log: &pubproto.Log{
-					Message: msg,
-				},
-			},
-		})
-	})
-
 	// TODO: check performance and maybe make concurrent
 	if err := a.activateNodes(logToCLI, in.NodePublicEndpoints, coordPeer); err != nil {
 		a.logger.Error("node activation failed", zap.Error(err))
@@ -169,7 +172,7 @@ func (a *API) activateNodes(logToCLI logFunc, nodePublicEndpoints []string, coor
 
 	// Activate all nodes.
 	for num, nodePublicEndpoint := range nodePublicEndpoints {
-		logToCLI("activating node %3d out of %3d nodes", num+1, len(nodePublicEndpoints))
+		logToCLI("Activating node %3d out of %3d ...", num+1, len(nodePublicEndpoints))
 		nodeVPNIP, err := a.core.GetNextNodeIP()
 		if err != nil {
 			a.logger.Error("generation of vpn ips failed", zap.Error(err))
diff --git a/coordinator/pubapi/coord_test.go b/coordinator/pubapi/coord_test.go
index 802094269..2dbe931cd 100644
--- a/coordinator/pubapi/coord_test.go
+++ b/coordinator/pubapi/coord_test.go
@@ -152,11 +152,11 @@ func TestActivateAsCoordinator(t *testing.T) {
 			require.NoError(err)
 
 			// Coordinator streams logs and admin conf
-			require.Len(stream.sent, len(tc.nodes)+1)
-			for i := 0; i < len(tc.nodes); i++ {
+			require.Greater(len(stream.sent), len(tc.nodes))
+			for i := 0; i < len(stream.sent)-1; i++ {
 				assert.NotEmpty(stream.sent[i].GetLog().Message)
 			}
-			adminConfig := stream.sent[len(tc.nodes)].GetAdminConfig()
+			adminConfig := stream.sent[len(stream.sent)-1].GetAdminConfig()
 			assert.Equal("192.0.2.99", adminConfig.AdminVpnIp)
 			assert.Equal(coordinatorPubKey, adminConfig.CoordinatorVpnPubKey)
 			assert.Equal(core.kubeconfig, adminConfig.Kubeconfig)