diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go
index f59e843a43..b6a0ccec81 100644
--- a/accounts/pkg/service/v0/accounts.go
+++ b/accounts/pkg/service/v0/accounts.go
@@ -308,7 +308,8 @@ func (s Service) CreateAccount(ctx context.Context, in *proto.CreateAccountReque
 	if in.Account == nil {
 		return merrors.InternalServerError(s.id, "invalid account: empty")
 	}
-	*out = *in.Account
+
+	out.XXX_Merge(in.Account)
 
 	if out.Id == "" {
 		out.Id = uuid.Must(uuid.NewV4()).String()
diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go
index 8b307f576c..c65f04b8b9 100644
--- a/accounts/pkg/service/v0/groups.go
+++ b/accounts/pkg/service/v0/groups.go
@@ -113,7 +113,7 @@ func (s Service) CreateGroup(c context.Context, in *proto.CreateGroupRequest, ou
 	if in.Group == nil {
 		return merrors.InternalServerError(s.id, "invalid group: empty")
 	}
-	*out = *in.Group
+	out.XXX_Merge(in.Group)
 
 	if out.Id == "" {
 		out.Id = uuid.Must(uuid.NewV4()).String()