samba - Feb 2005 - 'add machine script' broken after upgrade to RHEL AS 4

I just upgraded to Redhat Enterprise Linux AS 4 and now my 'add machine 
script' doesn't work.  If I run the command manually from the console, I
get this error:

useradd: invalid user name 'machinename$'

I figured this is because of the '$' at the end of the machine name.  I 
think the useradd command is part of Shadow-utils.  RHEL AS 4 is using 
shadow-utils-4.0.3-41.1 (RHEL AS 3 was using shadow-utils-4.0.3-22.02).
Does anyone know if this is in fact the problem?  Also, I know I can add 
the machine name without the '$' and then edit /etc/passwd to put it 
back, but is there a way to automate this with the 'add machine script'?

Thanks,

Dean