diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
index 259a25b7d78cb923de0eef6c21db2c9ccf3da23c..1127993b622b0f879f31e67cd82cd6f4977ac335 100644
--- a/gnome/src/config/accountconfigdialog.c
+++ b/gnome/src/config/accountconfigdialog.c
@@ -257,7 +257,7 @@ static GtkWidget* create_basic_tab(const account_t *account)
     else if (account_is_IAX(account))
         gtk_combo_box_set_active(GTK_COMBO_BOX(protocol_combo), 1);
     else {
-        DEBUG("Config: Error: Account protocol not valid");
+        ERROR("Account protocol not valid");
         /* Should never come here, add debug message. */
         gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(protocol_combo), _("Unknown"));
         gtk_combo_box_set_active(GTK_COMBO_BOX(protocol_combo), 2);
@@ -430,7 +430,7 @@ cell_edited_cb(GtkCellRendererText *renderer, gchar *path_desc, gchar *text,
     GtkTreePath *path = gtk_tree_path_new_from_string(path_desc);
 
     gint column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(renderer), "column"));
-    DEBUG("path desc in cell_edited_cb: %s\n", text);
+    DEBUG("path desc: %s\n", text);
 
     if ((utf8_case_equal(path_desc, "0")) &&
         !utf8_case_equal(text, gtk_entry_get_text(GTK_ENTRY(entry_username))))
@@ -448,8 +448,7 @@ static void
 editing_started_cb(GtkCellRenderer *cell UNUSED, GtkCellEditable * editable,
                    const gchar * path, gpointer data UNUSED)
 {
-    DEBUG("Editing started");
-    DEBUG("path desc in editing_started_cb: %s\n", path);
+    DEBUG("path desc: %s\n", path);
 
     // If we are dealing the first row
     if (utf8_case_equal(path, "0"))
@@ -584,13 +583,13 @@ static void local_interface_changed_cb(GtkWidget * widget UNUSED, gpointer data
 static void set_published_addr_manually_cb(GtkWidget * widget, gpointer data UNUSED)
 {
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
-        DEBUG("Config: Showing manual publishing options");
+        DEBUG("Showing manual publishing options");
         gtk_widget_show(published_port_label);
         gtk_widget_show(published_port_spin_box);
         gtk_widget_show(published_address_label);
         gtk_widget_show(published_address_entry);
     } else {
-        DEBUG("Config: Hiding manual publishing options");
+        DEBUG("Hiding manual publishing options");
         gtk_widget_hide(published_port_label);
         gtk_widget_hide(published_port_spin_box);
         gtk_widget_hide(published_address_label);
@@ -605,7 +604,7 @@ static void use_stun_cb(GtkWidget *widget, gpointer data UNUSED)
         return;
 
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
-        DEBUG("Config: Showing stun options, hiding Local/Published info");
+        DEBUG("Showing stun options, hiding Local/Published info");
         gtk_widget_show(stun_server_label);
         gtk_widget_show(stun_server_entry);
         gtk_widget_set_sensitive(stun_server_entry, TRUE);
@@ -617,7 +616,7 @@ static void use_stun_cb(GtkWidget *widget, gpointer data UNUSED)
         gtk_widget_hide(published_address_entry);
         gtk_widget_hide(published_port_spin_box);
     } else {
-        DEBUG("Config: disabling stun options, showing Local/Published info");
+        DEBUG("disabling stun options, showing Local/Published info");
         gtk_widget_set_sensitive(stun_server_entry, FALSE);
         gtk_widget_set_sensitive(same_as_local_radio_button, TRUE);
         gtk_widget_set_sensitive(published_addr_radio_button, TRUE);
@@ -1010,7 +1009,7 @@ GtkWidget* create_published_address(const account_t *account)
 GtkWidget* create_advanced_tab(const account_t *account)
 {
     // Build the advanced tab, to appear on the account configuration panel
-    DEBUG("Config: Build advanced tab");
+    DEBUG("Build advanced tab");
 
     GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
 
@@ -1192,10 +1191,10 @@ static void update_account_from_basic_tab(account_t *account)
         }
 
         if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(overrtp))) {
-            DEBUG("Config: Set dtmf over rtp");
+            DEBUG("Set dtmf over rtp");
             account_replace(account, ACCOUNT_DTMF_TYPE, OVERRTP);
         } else {
-            DEBUG("Config: Set dtmf over sip");
+            DEBUG("Set dtmf over sip");
             account_replace(account, ACCOUNT_DTMF_TYPE, SIPINFO);
         }