--- ecommerce/contrib/ec_useracc/ec_useracc.module.tokens	2007-03-04 21:13:54.000000000 -0500
+++ ecommerce/contrib/ec_useracc/ec_useracc.module	2007-05-14 19:33:16.000000000 -0400
@@ -568,7 +568,7 @@
 function ec_useracc_token_list($type = 'all') {
   $tokens = array();
   if (in_array($type, array(ECMAIL_TYPE_EMAIL_CONFIRM, ECMAIL_TYPE_SITE_WELCOME))) {
-    $tokens = token_list('user');
+    $tokens = token_token_list('user');
   }
   
   if ($type == 'all' || $type == ECMAIL_TYPE_EMAIL_CONFIRM) {
@@ -590,7 +590,7 @@
   $account = (object) $object;
   
   if (in_array($type, array(ECMAIL_TYPE_EMAIL_CONFIRM, ECMAIL_TYPE_SITE_WELCOME))) {
-    $values = token_values('user', $account);
+    $values = array(token_get_values('user', $account));
   }
   
   switch ($type) {