diff --git a/db.go b/db.go
index 3c7b6a5..c2c845d 100644
--- a/db.go
+++ b/db.go
@@ -105,13 +105,6 @@ func (net *Network) URL() (*url.URL, error) {
 	return u, nil
 }
 
-func (net *Network) GetUsername() string {
-	if net.Username != "" {
-		return net.Username
-	}
-	return net.Nick
-}
-
 func GetNick(user *User, net *Network) string {
 	if net.Nick != "" {
 		return net.Nick
@@ -119,6 +112,13 @@ func GetNick(user *User, net *Network) string {
 	return user.Username
 }
 
+func GetUsername(user *User, net *Network) string {
+	if net.Username != "" {
+		return net.Username
+	}
+	return GetNick(user, net)
+}
+
 func GetRealname(user *User, net *Network) string {
 	if net.Realname != "" {
 		return net.Realname
diff --git a/upstream.go b/upstream.go
index 8be08ac..eaefff6 100644
--- a/upstream.go
+++ b/upstream.go
@@ -1673,7 +1673,7 @@ func splitSpace(s string) []string {
 func (uc *upstreamConn) register() {
 	uc.nick = GetNick(&uc.user.User, &uc.network.Network)
 	uc.nickCM = uc.network.casemap(uc.nick)
-	uc.username = uc.network.GetUsername()
+	uc.username = GetUsername(&uc.user.User, &uc.network.Network)
 	uc.realname = GetRealname(&uc.user.User, &uc.network.Network)
 
 	uc.SendMessage(&irc.Message{