diff --git a/ansible/roles/docker/templates/docker.cfg b/ansible/roles/docker/templates/docker.cfg
index 63bfb56..60bc2d3 100644
--- a/ansible/roles/docker/templates/docker.cfg
+++ b/ansible/roles/docker/templates/docker.cfg
@@ -1,2 +1,2 @@
-DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.200:5000 -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --registry-mirror=http://10.100.198.200:5001"
+DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.200:5000 -H unix:///var/run/docker.sock --registry-mirror=http://10.100.198.200:5001"
 DOCKER_OPTS="$DOCKER_OPTS --insecure-registry 10.100.198.201:5000"
diff --git a/config/sample.yml b/config/sample.yml
index 07db51e..5736385 100644
--- a/config/sample.yml
+++ b/config/sample.yml
@@ -88,5 +88,11 @@
   #  - dell_apt_repo="deb [arch=amd64] http://10.1.0.1:8889/mirror/linux.dell.com/repo/community trusty openmanage"
   #  - juju_apt_repo="deb [arch=amd64] http://10.1.0.1:8889/mirror/ppa.launchpad.net/juju/stable/ubuntu trusty main"
 
+# If passwords are not set, random passwords will be generated
+passwords:
+  #compute_node: ubuntu
+  #maas_admin: admin
+  #maas_user: cord
+
 docker:
   imageVersion: candidate
diff --git a/docs/quickstart_physical.md b/docs/quickstart_physical.md
index f5af2d1..2c4034a 100644
--- a/docs/quickstart_physical.md
+++ b/docs/quickstart_physical.md
@@ -321,8 +321,10 @@
 
 This step is complete when the command successfully runs. The Web UI for MAAS
 can be viewed by browsing to the target machine using a URL of the form
-`http://head-node-ip-address:5240/MAAS`. To login web page , use Cord for
-username and password.
+`http://head-node-ip-address:5240/MAAS`. To login to the web page, use `cord`
+for username. If you have set a password in the deployment configuration
+password use that, else the password used can be found in your build directory
+under `<base>/build/maas/passwords/maas_user.txt`.
 
 After the `deployBase` command install `MAAS`, it initiates the download of
 an Ubuntu 14.04 boot image that will be used to boot the other POD servers.