2 files changed, 14 insertions, 1 deletions
diff --git a/irc.c b/irc.c
index e2486c10..2093fa5b 100644
--- a/irc.c
+++ b/irc.c
@@ -108,7 +108,7 @@ irc_t *irc_new( int fd )
 	s = set_add( &b->set, "display_timestamps", "true", set_eval_bool, irc );
 	s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc );
 	s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
-	s = set_add( &b->set, "nick_format", "%-@handle", NULL, irc );
+	s = set_add( &b->set, "nick_format", "%-@nick", NULL, irc );
 	s = set_add( &b->set, "offline_user_quits", "true", set_eval_bool, irc );
 	s = set_add( &b->set, "ops", "both", set_eval_irc_channel_ops, irc );
 	s = set_add( &b->set, "paste_buffer", "false", set_eval_bool, irc );
diff --git a/nick.c b/nick.c
index bc81d50e..c8e4916f 100644
--- a/nick.c
+++ b/nick.c
@@ -135,6 +135,13 @@ char *nick_gen( bee_user_t *bu )
 					return NULL;
 				fmt += 2;
 			}
+			else if( g_strncasecmp( fmt, "nick", 4 ) == 0 )
+			{
+				part = bu->nick ? : bu->handle;
+				fmt += 4;
+				ok |= TRUE;
+				break;
+			}
 			else if( g_strncasecmp( fmt, "handle", 6 ) == 0 )
 			{
 				part = bu->handle;
@@ -157,6 +164,12 @@ char *nick_gen( bee_user_t *bu )
 				chop = ' ';
 				break;
 			}
+			else if( g_strncasecmp( fmt, "group", 5 ) == 0 )
+			{
+				part = bu->group ? bu->group->name : NULL;
+				fmt += 5;
+				break;
+			}
 			else
 			{
 				return NULL;