diff --git a/CHANGES.md b/CHANGES.md
index 3ee3ae5..794e4f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 # Change log - CloudControl plugins for Packer
 
+## v0.1.3-beta8
+
+* Don't auto-generate InitialAdminPassword if one is not supplied (DimensionDataResearch/packer-plugins-ddcloud#3).
+
 ## v0.1.3-beta7
 
 * Don't send admin password when deploying a server if no password was provided (DimensionDataResearch/packer-plugins-ddcloud#3).
diff --git a/CommonVars.inc b/CommonVars.inc
index 9a30b43..4a1eff6 100644
--- a/CommonVars.inc
+++ b/CommonVars.inc
@@ -1,4 +1,4 @@
-VERSION = 0.1.3-beta7
+VERSION = 0.1.3-beta8
 VERSION_INFO_FILE = ./version-info.go
 
 BUILDER_PLUGIN_NAMES = customerimage customerimage-import
diff --git a/builders/customerimage/config/settings.go b/builders/customerimage/config/settings.go
index bbfa2e6..8e7da4d 100644
--- a/builders/customerimage/config/settings.go
+++ b/builders/customerimage/config/settings.go
@@ -109,10 +109,6 @@ func (settings *Settings) Validate() (err error) {
 		)
 	}
 
-	if settings.InitialAdminPassword == "" {
-		settings.InitialAdminPassword = settings.UniquenessKey // NOT secure.
-	}
-
 	// Communicator defaults.
 	settings.CommunicatorConfig.SSHTimeout = 2 * time.Minute
 	settings.CommunicatorConfig.WinRMTimeout = 2 * time.Minute
diff --git a/docs/plugins/builders/customerimage.md b/docs/plugins/builders/customerimage.md
index 87646ba..0b8a1f8 100644
--- a/docs/plugins/builders/customerimage.md
+++ b/docs/plugins/builders/customerimage.md
@@ -18,7 +18,7 @@ Can also be specified via the `MCP_PASSWORD` environment variable.
 Set this to `true` if you're running packer from inside the MCP 2.0 network domain where the image will be created.
 * `client_ip` (Optional) is your client machine's public (external) IP address.  
 Required if `use_private_ipv4` is not set.
-* `initial_admin_password` (Optional) The administrator password to use when deploying the server from which the image will be created.
+* `initial_admin_password` (Required unless image does not require) The administrator password to use when deploying the server from which the image will be created.
 
 ## Sample configurations
 
@@ -37,6 +37,7 @@ Required if `use_private_ipv4` is not set.
 			"vlan": "MyVLAN",
             "source_image": "Ubuntu 14.04 2 CPU",
 			"target_image": "packertest",
+			"initial_admin_password": "sn4u$ag3$!",
 			"client_ip": "1.2.3.4",
 			"communicator": "ssh"
 		}