diff --git a/manifests/ec2-ebs-pvm.manifest.json b/manifests/ec2-ebs-pvm.manifest.json
index c81e8fb..64cbbd6 100644
--- a/manifests/ec2-ebs-pvm.manifest.json
+++ b/manifests/ec2-ebs-pvm.manifest.json
@@ -8,10 +8,10 @@
 
 	"bootstrapper": {
 		"mount_dir": "/target",
-		"mirror": "http://http.debian.net/"
+		"mirror": "http://http.debian.net/debian"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
 		"description": "Debian {release} {architecture} AMI ({virtualization})"
 	},
 	"system": {
@@ -28,7 +28,8 @@
 	},
 	"plugins": {
 		"admin_user": {
-			"enabled": false
+			"enabled": true,
+			"username": "admin"
 		},
 		"build_metadata": {
 			"enabled": false,
diff --git a/manifests/ec2-s3-pvm.manifest.json b/manifests/ec2-s3-pvm.manifest.json
index 335be1e..006de3b 100644
--- a/manifests/ec2-s3-pvm.manifest.json
+++ b/manifests/ec2-s3-pvm.manifest.json
@@ -10,10 +10,11 @@
 	},
 
 	"bootstrapper": {
-		"mount_dir": "/target"
+		"mount_dir": "/target",
+		"mirror": "http://http.debian.net/debian"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
 		"description": "Debian {release} {architecture} AMI ({virtualization})"
 		"bucket":      ""
 	},
@@ -30,6 +31,10 @@
 		"size":         1024
 	},
 	"plugins": {
+		"admin_user": {
+			"enabled": true,
+			"username": "admin"
+		},
 		"prebootstrapped": {
 			"enabled":  false,
 			"image": null
diff --git a/plugins/admin_user/tasks.py b/plugins/admin_user/tasks.py
index 3df12f4..387894f 100644
--- a/plugins/admin_user/tasks.py
+++ b/plugins/admin_user/tasks.py
@@ -24,7 +24,7 @@ class CreateAdminUser(Task):
 		from common.tools import log_check_call
 		log_check_call(['/usr/sbin/chroot', info.root,
 		                '/usr/sbin/useradd',
-		                '--create-home', '--shell /bin/bash',
+		                '--create-home', '--shell', '/bin/bash',
 		                info.manifest.plugins['admin_user']['username']])