diff --git a/files/populate.ldif.template b/files/populate.ldif.template
index 9356ca0..22698f8 100644
--- a/files/populate.ldif.template
+++ b/files/populate.ldif.template
@@ -29,7 +29,7 @@ objectclass: top
 sn:  service
 uid: ldapclient
 uidnumber: 1499
-userpassword: {MD5}{{ldpad_client_password}}
+userpassword: {MD5}{{ldpad_client_password_md5}}
 
 
 # Entry 1: cn={{user_uid}},ou=Groups,{{ldap_base}}
@@ -57,7 +57,7 @@ sudohost: ALL
 sudouser: {{user_last_name}}
 uid: {{user_uid}}
 uidnumber: 1500
-userpassword: {MD5}{{user_password}}
+userpassword: {MD5}{{user_password_md5}}
 
 
 # Entry 1: cn=app_sso_admin,ou=Groups,{{ldap_base}}
diff --git a/index.sh b/index.sh
index 0169ba6..5c9cb33 100755
--- a/index.sh
+++ b/index.sh
@@ -7,7 +7,7 @@ source lib/mo
 
 if [ ! -f ./ldap.vars ]; then
     echo "ldap.vars file not found!"
-    echo "Please copy ldap.vars_template to ldap.vars and edit it."
+    echo "Please copy ldap.vars.template to ldap.vars and edit it."
     exit 1
 fi
 
@@ -40,7 +40,7 @@ echo '' > /etc/ldap/ldap.conf
 echo "BASE   $ldap_base" >> /etc/ldap/ldap.conf
 echo "URI    ldap://localhost" >> /etc/ldap/ldap.conf
 
-temp_populate_ldif=$(mkdir)
+temp_populate_ldif=$(mktemp)
 populate_ldif_template="$(cat files/populate.ldif.template)"
 echo "$populate_ldif_template" | mo > "$temp_populate_ldif"