560,561c560,561
<     r"([\-\w]+)"                     # User name
<     r"(?:\:([\-\w]+))?"              # Optional password
---
>     r"(\w+)"                     # User name
>     r"(?:\:(\w+))?"              # Optional password