diff --git a/config_dev b/config_dev
index 8e8acbf0..bff51fce 100644
--- a/config_dev
+++ b/config_dev
@@ -319,7 +319,7 @@ settings = {
     theme = "default.theme";
     nick_column_enabled = "yes";
     nick_column_width = "10";
-    debug_nick_column = "yes";
+    debug_nick_column = "no";
   };
   "fe-text" = {
     lag_min_show = "1s";
diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c
index b82bfc01..20054f04 100644
--- a/src/fe-common/core/fe-expandos.c
+++ b/src/fe-common/core/fe-expandos.c
@@ -58,9 +58,10 @@ static int count_nick_chars(const char *str)
 		if (isalnum(*p)) {
 			count++;
 		}
-		/* Specjalne znaki nicka */
-		else if (*p == '-' || *p == '[' || *p == ']' || *p == '\\' ||
-		         *p == '`' || *p == '^' || *p == '{' || *p == '}') {
+		/* Specjalne znaki nicka - zgodnie z isnickchar z fe-messages.c */
+		else if (*p == '`' || *p == '-' || *p == '_' ||
+		         *p == '[' || *p == ']' || *p == '{' || *p == '}' ||
+		         *p == '|' || *p == '\\' || *p == '^') {
 			count++;
 		}
 		/* Ignoruje kody kolorów %B %N %Y %n itp. */