diff --git a/libs/sofia-sip/libsofia-sip-ua/url/url.c b/libs/sofia-sip/libsofia-sip-ua/url/url.c
index 9b009d71d5..b0ec755871 100644
--- a/libs/sofia-sip/libsofia-sip-ua/url/url.c
+++ b/libs/sofia-sip/libsofia-sip-ua/url/url.c
@@ -592,9 +592,14 @@ int _url_d(url_t *url, char *s)
 
   if (url->url_type == url_sip || url->url_type == url_sips) {
     /* SIP URL may have /; in user part */
-    n = strcspn(s, "@#");	/* Opaque part */
-    if (s[n] != '@')
-      n = 0;
+    n = strcspn(s, "@");	/* Opaque part */
+	if (n == strlen(s)) {
+		if ((strchr(s, '#')))
+			n = 0;
+	} else {
+		if (strchr(s + n, '#'))
+			n = 0;
+	}
     n += strcspn(s + n, "/;?#");
   }
   else if (url->url_type == url_wv) {