diff --git a/stackit/internal/services/postgresflexalpha/database/resource.go b/stackit/internal/services/postgresflexalpha/database/resource.go
index e2013f29..84c830c5 100644
--- a/stackit/internal/services/postgresflexalpha/database/resource.go
+++ b/stackit/internal/services/postgresflexalpha/database/resource.go
@@ -236,6 +236,7 @@ func (r *databaseResource) Create(
 		return
 	}
 
+	// TODO: wait handler bauen
 	database, err := getDatabaseById(ctx, r.client, projectId, region, instanceId, databaseId)
 	if err != nil {
 		core.LogAndAddError(
diff --git a/stackit/internal/services/postgresflexalpha/user/resource.go b/stackit/internal/services/postgresflexalpha/user/resource.go
index d4f9e78e..7498bdb1 100644
--- a/stackit/internal/services/postgresflexalpha/user/resource.go
+++ b/stackit/internal/services/postgresflexalpha/user/resource.go
@@ -196,6 +196,7 @@ func (r *userResource) Create(
 		)
 		return
 	}
+	arg.userId = id
 
 	ctx = tflog.SetField(ctx, "user_id", id)