diff --git a/src/bin/callbacks.c b/src/bin/callbacks.c
index 960f74a..09b70f7 100644
--- a/src/bin/callbacks.c
+++ b/src/bin/callbacks.c
@@ -318,7 +318,7 @@ _callback_user_nick(Express_Network *net EINA_UNUSED, const char *event EINA_UNU
    DBG("\t%s", params[2]);
    DBG("\t%s", params[3]);
 
-   snprintf(buff, sizeof(buff), "%s is now known as %s", source, user);
+   snprintf(buff, sizeof(buff), "%s is now known as %s\r\n", source, user);
 
    /* find all channels that this user is in */
    channels = _window_channels_user_find(source);
diff --git a/src/lib/network.c b/src/lib/network.c
index 83d9d74..229c10b 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -78,6 +78,8 @@ _process_buffer(Express_Network *net, char *data, int length)
    /*   { */
    /*      CRI("Partial Prefix Message: %s", data); */
    /*   } */
+   if (prefix)
+      prefix = eina_stringshare_add(prefix);
 
    /* parse out any 3-digit command numbers */
    if ((isdigit(ptr[0]) && (isdigit(ptr[1])) && (isdigit(ptr[2]))))