diff --git a/group-assignment/main.tf b/group-assignment/main.tf
index dc23192..7ff7414 100644
--- a/group-assignment/main.tf
+++ b/group-assignment/main.tf
@@ -1,7 +1,7 @@
 locals {
   name               = coalesce(var.name, try(local.settings.group, null))
   description        = coalesce(var.description, try(local.settings.description, null), local.name)
-  permissionset_name = coalesce(var.permissionset_name, local.name)
+  permissionset_name = coalesce(var.permissionset_name, try(local.settings.group, null), local.name)
   permissionset_arn  = coalesce(var.permissionset_arn, try(data.aws_ssoadmin_permission_set.pset[0].arn, null))
 }
 
@@ -44,8 +44,14 @@ resource "aws_ssoadmin_account_assignment" "accounts" {
 }
 
 data "aws_ssoadmin_permission_set" "pset" {
-  count        = var.permissionset_arn == null && local.permissionset_name != null ? 1 : 0
+  count        = var.permissionset_arn ? 1 : 0
   instance_arn = var.instance_arn
   name         = local.permissionset_name
-}
 
+  lifecycle {
+    precondition {
+      condition     = local.permissionset_arn != null
+      error_message = "The permissionset name must be present."
+    }
+  }
+}