diff --git a/HTTP.cpp b/HTTP.cpp
index 76ab54ac..27421241 100644
--- a/HTTP.cpp
+++ b/HTTP.cpp
@@ -73,6 +73,7 @@ namespace http {
     std::size_t pos_p = 0; /* < current parse position */
     std::size_t pos_c = 0; /* < work position */
     if(url.at(0) != '/' || pos_p > 0) {
+      std::size_t pos_s = 0;
       /* schema */
       pos_c = url.find("://");
       if (pos_c != std::string::npos) {
@@ -80,9 +81,9 @@ namespace http {
         pos_p = pos_c + 3;
       }
       /* user[:pass] */
-      pos_c = url.find('@', pos_p);
-      std::size_t pos_slash = url.find('/', pos_p);
-      if (pos_c != std::string::npos && (pos_slash == std::string::npos || pos_slash > pos_c)) {
+      pos_s = url.find('/', pos_p); /* find first slash */
+      pos_c = url.find('@', pos_p); /* find end of 'user' or 'user:pass' part */
+      if (pos_c != std::string::npos && (pos_s == std::string::npos || pos_s > pos_c)) {
         std::size_t delim = url.find(':', pos_p);
         if (delim != std::string::npos && delim < pos_c) {
           user = url.substr(pos_p, delim - pos_p);
@@ -91,7 +92,7 @@ namespace http {
         } else {
           user = url.substr(pos_p, pos_c - pos_p);
         }
-        pos_p = pos_c + 1;        
+        pos_p = pos_c + 1;
       }
       /* hostname[:port][/path] */
       pos_c = url.find_first_of(":/", pos_p);
diff --git a/tests/test-http-url.cpp b/tests/test-http-url.cpp
index d574f1e2..37e9c45e 100644
--- a/tests/test-http-url.cpp
+++ b/tests/test-http-url.cpp
@@ -104,6 +104,18 @@ int main() {
   assert(url->query == "");
   delete url;
 
+  url = new URL;
+  assert(url->parse("http://user:password@site.com:84/asdasd/@17#frag") == true);
+  assert(url->schema == "http");
+  assert(url->user == "user");
+  assert(url->pass == "password");
+  assert(url->host == "site.com");
+  assert(url->port == 84);
+  assert(url->path == "/asdasd/@17");
+  assert(url->query == "");
+  assert(url->frag == "frag");
+  delete url;
+
   return 0;
 }