diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index 69be175ceff..321589466c4 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -27,7 +27,7 @@
 user=root
 
 # Add your DHCP lease folders here
-DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/*"
+DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/* /var/lib/dhcp/*"
 password_received=0
 file_count=0
 error_count=0
@@ -95,7 +95,7 @@ then
 fi
 
 logger -t "cloud" "Changing password ..."
-echo $password | passwd --stdin $user
+echo $user:$password | chpasswd
 						
 if [ $? -gt 0 ]
 then