diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb9987c..a5ff92a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,3 +67,6 @@
 
 * 2.8.2 -- 2022-09-13
   - fix lowercase() -> lower()
+
+* 2.8.3 -- 2022-09-14
+  - fix access key variables and usage
diff --git a/access_keys.tf b/access_keys.tf
index f8fc474..3107191 100644
--- a/access_keys.tf
+++ b/access_keys.tf
@@ -31,9 +31,10 @@ locals {
       username         = aws_iam_user.user.name
       profile          = local.profile
       account_id       = local.account_id
-      create_date      = join("", aws_iam_access_key.iam_access_key_v1.*.create_date)
-      access_key_id    = join("", aws_iam_access_key.iam_access_key_v1.*.id)
-      encrypted_secret = join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret)
+      create_date      = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "create_date", "") : ""
+      access_key_id    = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "id", "") : ""
+      encrypted_secret = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "encrypted_secret", "") : ""
+      secret           = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "secret", "") : ""
   })
 }
 
diff --git a/outputs.access_keys.tf b/outputs.access_keys.tf
index 32dad34..602648b 100644
--- a/outputs.access_keys.tf
+++ b/outputs.access_keys.tf
@@ -10,11 +10,11 @@
 
 output "aws_access_key_id" {
   description = "AWS Access Key (current)"
-  value       = join("", aws_iam_access_key.iam_access_key_v1.*.id)
+  value       = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "id", "") : ""
 }
 
 output "aws_secret_access_key" {
   description = "AWS Secret Access Key [encrypted] (current)"
-  value       = join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret)
+  value       = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "encrypted_secret", "") : ""
 }
 
diff --git a/version.tf b/version.tf
index 0f37aab..c6b1ea7 100644
--- a/version.tf
+++ b/version.tf
@@ -1,4 +1,4 @@
 locals {
   _module_name    = "aws-iam-user"
-  _module_version = "2.8.2"
+  _module_version = "2.8.3"
 }