diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 0d85a44e4..2f4300d17 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -87,6 +87,9 @@ import_aws_configuration() {
 	# Create setup user
 	if ! getent passwd setup &>/dev/null; then
 		useradd setup -s /usr/bin/run-setup -g nobody -m
+
+		# Unlock the account
+		usermod -p "x" setup
 	fi
 
 	# Import SSH keys for setup user