diff --git a/tbsetup/mkacct.in b/tbsetup/mkacct.in
index 5acd9a8245039bf3bb914fe0f9742e005180d2c2..9da51453a1249297ec029e67f41533ca752f6b6e 100755
--- a/tbsetup/mkacct.in
+++ b/tbsetup/mkacct.in
@@ -2,7 +2,7 @@
 
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -348,8 +348,9 @@ if ($control_node ne $BOSSNODE) {
     }
 
     print "Updating user $user password on $control_node.\n";
+    $pswd =~ s/\$/\\\\\\\$/g;
 
-    if (system("$SSH -host $control_node $CHPASS -p $pswd $user")) {
+    if (system("$SSH -host $control_node $CHPASS -p '$pswd' $user")) {
 	fatal("Could not change password for user $user on $control_node.\n");
     }
 }