diff --git a/src/common/url.c b/src/common/url.c
index ef6e3fdb..b57f9fc3 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -396,7 +396,7 @@ re_host (void)
 	   "(" NOPARENS ")"						\
 	")*"	/* Zero or more occurrences of either of these */	\
 	"(?<![.,?!\\]])"	/* Not allowed to end with these */
-#define USERINFO "([-a-z0-9._~%]+@)"
+#define USERINFO "([-a-z0-9._~%]+(:[-a-z0-9._~%]*)?@)"
 
 /* Flags used to describe URIs (RFC 3986)
  *