diff --git a/uppsrc/Core/Inet.h b/uppsrc/Core/Inet.h
index cba5c55cf..c67df2872 100644
--- a/uppsrc/Core/Inet.h
+++ b/uppsrc/Core/Inet.h
@@ -276,7 +276,7 @@ struct UrlInfo {
 	String                            scheme;
 	String                            host;
 	String                            port;
-	String                            user;
+	String                            username;
 	String                            password;
 	String                            path;
 	String                            query;
diff --git a/uppsrc/Core/InetUtil.cpp b/uppsrc/Core/InetUtil.cpp
index 7a772a6ff..e3e50091d 100644
--- a/uppsrc/Core/InetUtil.cpp
+++ b/uppsrc/Core/InetUtil.cpp
@@ -682,12 +682,12 @@ void UrlInfo::Parse(const String& url_)
 		
 	q = h.Find('@');
 	if(q >= 0) {
-		user = h.Mid(0, q);
+		username = h.Mid(0, q);
 		h = h.Mid(q + 1);
-		q = user.Find(':');
+		q = username.Find(':');
 		if(q >= 0) {
-			password = user.Mid(q + 1);
-			user.Trim(q);
+			password = username.Mid(q + 1);
+			username.Trim(q);
 		}
 	}
 	q = h.Find('/');
diff --git a/uppsrc/Core/src.tpp/UrlInfo$en-us.tpp b/uppsrc/Core/src.tpp/UrlInfo$en-us.tpp
index cffa41645..e4334c94d 100644
--- a/uppsrc/Core/src.tpp/UrlInfo$en-us.tpp
+++ b/uppsrc/Core/src.tpp/UrlInfo$en-us.tpp
@@ -39,7 +39,7 @@ topic "UrlInfo";
 [s2;%% Port: [@3 9090]&]
 [s3; &]
 [s4; &]
-[s5;:Upp`:`:UrlInfo`:`:user: [_^Upp`:`:String^ String]_[* username]&]
+[s5;:Upp`:`:UrlInfo`:`:username: [_^Upp`:`:String^ String]_[* username]&]
 [s2;%% Authentication username: [@3 username]&]
 [s3; &]
 [s4; &]