--- a/mcabber/src/settings.c	Sun Oct 11 20:06:47 2009 +0200
+++ b/mcabber/src/settings.c	Sun Oct 11 20:58:20 2009 +0200
@@ -409,12 +409,7 @@
   if (nick)
     return g_strdup(nick);
 
-  nick = g_strdup(settings_opt_get("username"));
-  if (nick) {
-    char *p = strchr(nick, JID_DOMAIN_SEPARATOR);
-    if (p > nick)
-      *p = 0;
-  }
+  nick = jid_get_username(settings_opt_get("jid"));
   return nick;
 }