diff --git a/source3/smbadduser b/source3/smbadduser
index e4e1b273d14..9837413aeb5 100755
--- a/source3/smbadduser
+++ b/source3/smbadduser
@@ -6,13 +6,15 @@ unalias *
 set path = ($path /usr/local/samba/bin)
 
 set smbpasswd = /usr/local/samba/private/smbpasswd
+#set smbpasswd = /etc/samba/smbpasswd
 set user_map  = /usr/local/samba/lib/users.map
+#set user_map  = /etc/samba/smbusers
 #
 # Set to site specific passwd command
 #
-#set passwd    = "cat /etc/passwd"
+set passwd    = "cat /etc/passwd"
 #set passwd    = "niscat passwd.org_dir"
-set passwd    = "ypcat passwd"
+#set passwd    = "ypcat passwd"
 
 set line = "----------------------------------------------------------"
 if ($#argv == 0) then
@@ -53,9 +55,7 @@ foreach one ($argv)
 	endif
 
 	echo "Adding: $unix to $smbpasswd"
-	eval $passwd | \
-	awk -F: '$1==USR { \
-	printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:%s:%s:%s\n", $1, $3, $5, $6, $7) }' USR=$unix >> $smbpasswd
+	/usr/bin/smbpasswd -a -n $unix
 	if ($unix != $ntid) then
 		echo "Adding: {$unix = $ntid} to $user_map"
 		echo "$unix = $ntid" >> $user_map