Index: webform.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/webform/webform.module,v
retrieving revision 1.124.2.85
diff -u -r1.124.2.85 webform.module
--- webform.module	11 Jan 2009 07:38:50 -0000	1.124.2.85
+++ webform.module	18 Jan 2009 07:51:34 -0000
@@ -2090,6 +2090,12 @@
       profile_load_profile($user);
     }
   }
+  else {
+    $find[] = '%username';
+    $find[] = '%useremail';
+    $replace[] = '';
+    $replace[] = '';
+  }
 
   // Provide a list of candidates for token replacement.
   $tokens = array(
Index: webform_submissions.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/webform/webform_submissions.inc,v
retrieving revision 1.6.2.21
diff -u -r1.6.2.21 webform_submissions.inc
--- webform_submissions.inc	10 Jan 2009 02:45:23 -0000	1.6.2.21
+++ webform_submissions.inc	18 Jan 2009 07:51:34 -0000
@@ -146,7 +146,7 @@
            'LEFT JOIN {users} u ON u.uid = s.uid '.
            'WHERE sd.nid = %d';
 
-  if ($pager_count) {
+  if ($pager_count && !empty($sids)) {
     $query .= ' AND s.sid IN (%s)';
   }