diff --git a/debian/changelog b/debian/changelog
index b80e07c5..f35dd520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ livecd-rootfs (2.460) UNRELEASED; urgency=medium
 
   [ Balint Reczey ]
   * Mount using --make-rslave to ensure safe unmounts for rbind mounts
+  * Don't ask for password and GECOS while creating vagrant user
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 26 Sep 2017 00:59:08 -0400
 
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index d763ff18..d748560c 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -72,7 +72,7 @@ chroot ${mount_d} apt-get clean
 # Vagrant users expect a "vagrant" user with a "vagrant" username.
 # See https://www.vagrantup.com/docs/boxes/base.html
 # Note: We decided NOT to allow root login with a default password.
-chroot ${mount_d} adduser vagrant
+chroot ${mount_d} adduser vagrant --disabled-password --gecos ""
 echo "vagrant:vagrant" | chroot ${mount_d} chpasswd
 
 # The vagrant user should have passwordless sudo.