diff --git a/src/fe-gnome/text-entry.c b/src/fe-gnome/text-entry.c
index ecabb55..b7994df 100644
--- a/src/fe-gnome/text-entry.c
+++ b/src/fe-gnome/text-entry.c
@@ -563,7 +563,7 @@ tab_complete_nickname (GtkEntry *entry, gint start)
 				g_free (p);
 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
 			} else {
-				npt = g_strdup_printf ("%s: ", (char *) options->data);
+				npt = g_strdup_printf ("%s%s ", (char *) options->data, prefs.nick_suffix);
 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
 			}
 		} else {
@@ -577,7 +577,7 @@ tab_complete_nickname (GtkEntry *entry, gint start)
 				g_free (p);
 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
 			} else {
-				npt = g_strdup_printf ("%s: %s", (char *) options->data, at_cursor);
+				npt = g_strdup_printf ("%s%s %s", (char *) options->data, prefs.nick_suffix, at_cursor);
 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
 			}
 		}

