diff --git a/ChangeLog b/ChangeLog
index 7c0a01d1..60fef346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Allow '@' in username and password embedded in URI. It should be
+	percent-encoded but many people use their mail address as an
+	username and forget about PE.
+	* src/Request.cc
+	* test/RequestTest.cc
+
 2010-09-06  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Parse original URI when removing same host.
diff --git a/src/Request.cc b/src/Request.cc
index b52c5e62..0d98929d 100644
--- a/src/Request.cc
+++ b/src/Request.cc
@@ -196,9 +196,9 @@ bool Request::parseUri(const std::string& srcUri) {
     return false;
   }
   // find userinfo(username and password) in authority if they exist
-  std::string::const_iterator userInfoLast = authorityFirst;
+  std::string::const_iterator userInfoLast = authorityLast;
   std::string::const_iterator hostPortFirst = authorityFirst;
-  for(; userInfoLast != authorityLast; ++userInfoLast) {
+  for(; userInfoLast != authorityFirst-1; --userInfoLast) {
     if(*userInfoLast == '@') {
       hostPortFirst = userInfoLast;
       ++hostPortFirst;
diff --git a/test/RequestTest.cc b/test/RequestTest.cc
index 9e96af60..016e1e01 100644
--- a/test/RequestTest.cc
+++ b/test/RequestTest.cc
@@ -471,33 +471,32 @@ void RequestTest::testSetUri_zeroUsername()
 void RequestTest::testSetUri_username()
 {
   Request req;
-  CPPUNIT_ASSERT(req.setUri("ftp://aria2user@localhost/download/aria2-1.0.0.tar.bz2"));
+  CPPUNIT_ASSERT(req.setUri("ftp://aria2@user@localhost/download/aria2-1.0.0.tar.bz2"));
   CPPUNIT_ASSERT_EQUAL(std::string("ftp"), req.getProtocol());
   CPPUNIT_ASSERT_EQUAL((uint16_t)21, req.getPort());
   CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req.getHost());
   CPPUNIT_ASSERT_EQUAL(std::string("/download"), req.getDir());
   CPPUNIT_ASSERT_EQUAL(std::string("aria2-1.0.0.tar.bz2"), req.getFile());
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2user"), req.getUsername());
+  CPPUNIT_ASSERT_EQUAL(std::string("aria2@user"), req.getUsername());
   CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPassword());
 }
 
 void RequestTest::testSetUri_usernamePassword()
 {
   Request req;
-  CPPUNIT_ASSERT(req.setUri("ftp://aria2user%40:aria2pass%40@localhost/download/aria2-1.0.0.tar.bz2"));
+  CPPUNIT_ASSERT(req.setUri("ftp://aria2@user%40:aria2@pass%40@localhost/download/aria2-1.0.0.tar.bz2"));
   CPPUNIT_ASSERT_EQUAL(std::string("ftp"), req.getProtocol());
   CPPUNIT_ASSERT_EQUAL((uint16_t)21, req.getPort());
   CPPUNIT_ASSERT_EQUAL(std::string("localhost"), req.getHost());
   CPPUNIT_ASSERT_EQUAL(std::string("/download"), req.getDir());
   CPPUNIT_ASSERT_EQUAL(std::string("aria2-1.0.0.tar.bz2"), req.getFile());
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2user@"), req.getUsername());
-  CPPUNIT_ASSERT_EQUAL(std::string("aria2pass@"), req.getPassword());
+  CPPUNIT_ASSERT_EQUAL(std::string("aria2@user@"), req.getUsername());
+  CPPUNIT_ASSERT_EQUAL(std::string("aria2@pass@"), req.getPassword());
 
   // make sure that after new uri is set, username and password are updated.
   CPPUNIT_ASSERT(req.setUri("ftp://localhost/download/aria2-1.0.0.tar.bz2"));
   CPPUNIT_ASSERT_EQUAL(std::string(""), req.getUsername());
   CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPassword());
-
 }
 
 void RequestTest::testSetUri_supportsPersistentConnection()