***************
*** 941,953 ****
  ## pass: roundcube.db is in homedir.tar. The logic reads better if this is blank block.
              }
              elsif ( $> == 0 && Cpanel::MysqlUtils::db_exists('roundcube') && _db_needs_backup( 'mysql', 'roundcube', $mysqldatadir, "$work_dir/mysql-timestamps/roundcube", [$round_db], \%LASTUPDATETIMES ) ) {
-                 
-                 
-                 my @dns_regex_list = grep( !/(?:^www\.|\*)/i, @DNS );
-                 my $dnslist = join( '|', @dns_regex_list );
-                 $dnslist =~ s/\./\\./g;
  ## case 16846: adding "username = '$user'" to ensure the system users that use webmail are converted
-                 my $ids = Cpanel::SafeRun::Simple::saferun($mysql,'roundcube','-B','-ss','-e',"SELECT user_id FROM users WHERE username REGEXP '@(${dnslist})\$' or username = '$user'");
                  if ($ids) {
                      $ids = join ',', split /\n/, $ids;
  
--- 937,944 ----
  ## pass: roundcube.db is in homedir.tar. The logic reads better if this is blank block.
              }
              elsif ( $> == 0 && Cpanel::MysqlUtils::db_exists('roundcube') && _db_needs_backup( 'mysql', 'roundcube', $mysqldatadir, "$work_dir/mysql-timestamps/roundcube", [$round_db], \%LASTUPDATETIMES ) ) {
  ## case 16846: adding "username = '$user'" to ensure the system users that use webmail are converted
+                 my $ids = Cpanel::SafeRun::Simple::saferun($mysql,'roundcube','-B','-ss','-e',"SELECT user_id FROM users WHERE username REGEXP '@(${sql_dnslist})\$' or username = '$user'");
                  if ($ids) {
                      $ids = join ',', split /\n/, $ids;