diff --git a/http_parse.c b/http_parse.c
index e55b6f4a..448b73a0 100644
--- a/http_parse.c
+++ b/http_parse.c
@@ -1426,8 +1426,17 @@ parseUrl(const char *url, int len,
             }
         } else {
             for(i = x; i < len; i++)
-                if(url[i] == ':' || url[i] == '/')
+tryagain:
+                if(url[i] == ':' || url[i] == '/' || url[i] == '@') {
+                    int tom = i;
+                    while (url[tom] != '/') {
+                        if (url[tom++] == '@') {
+                            i = tom;
+                            goto tryagain;
+                        }
+                    }
                     break;
+                }
         }
         y = i;