It wasn't just these 2, it was also Ron Paul and several others.
You're correct.
The USA PATRIOT Act passed the Senate by a vote of 98 to 1. Russ Feingold (D-WI), a strong civil libertarian who was unfortunately defeated in the 2010 election, was the sole opponent.
The bill passed the House by a vote of 357 to 66. Of the 66 constitutional defenders, 62 were Democrats, 3 were Republicans, and 1 was an Independent. Five of them--Tammy Baldwin, Sherrod Brown, Bernie Sanders, Mark Udall, and Tom Udall--now serve in the Senate.