diff --git a/create-aws-user.sh b/create-aws-user-and-key.sh
similarity index 75%
rename from create-aws-user.sh
rename to create-aws-user-and-key.sh
index cbec618..53869a9 100755
--- a/create-aws-user.sh
+++ b/create-aws-user-and-key.sh
@@ -5,3 +5,5 @@ USERNAME=$1
 aws iam create-user --user-name $USERNAME
 
 aws iam add-user-to-group --user-name $USERNAME --group-name CraftListBuckets
+
+aws iam create-access-key --user-name $USERNAME
diff --git a/delete-aws-user.sh b/delete-aws-user-and-key.sh
similarity index 100%
rename from delete-aws-user.sh
rename to delete-aws-user-and-key.sh
diff --git a/s3-spin-up-a-bucket.sh b/s3-spin-up-a-bucket.sh
index f2abcbe..fb58906 100755
--- a/s3-spin-up-a-bucket.sh
+++ b/s3-spin-up-a-bucket.sh
@@ -9,9 +9,7 @@
 # 5. Finally we need to create an access token for the user.
 BUCKETNAME=$1
 
-./create-aws-user.sh $BUCKETNAME
-
-aws iam create-access-key --user-name $BUCKETNAME
+./create-aws-user-and-key.sh $BUCKETNAME
 
 # Create a bucket in Ireland, because Craft2 S3 functionality needs a little
 # older authentication scheme only found in certain AWS data centers.