diff --git a/gnome/src/accountlist.c b/gnome/src/accountlist.c
index b908915138cad1dfa9a72b4c0c8b8ef185be046b..44c79b011b3ea89f57d8a02f8c87c193c9500de5 100644
--- a/gnome/src/accountlist.c
+++ b/gnome/src/accountlist.c
@@ -191,6 +191,7 @@ void account_list_free_elm(gpointer elm, gpointer data UNUSED)
 {
     account_t *a = elm;
     g_free(a->accountID);
+    a->accountID = NULL;
     g_free(a);
 }
 
@@ -297,7 +298,7 @@ gboolean current_account_has_new_message(void)
 gboolean account_is_IP2IP(const account_t *account)
 {
     g_assert(account);
-    return utf8_case_equal(account->accountID, IP2IP_PROFILE);
+    return g_strcmp0(account->accountID, IP2IP_PROFILE);
 }
 
 static gboolean is_type(const account_t *account, const gchar *type)
diff --git a/gnome/src/codeclist.c b/gnome/src/codeclist.c
index 25b69d9c7f985cb326529a2bfe554ff0a3c7d850..9a83e5f42d1cf80b8b1a7ac801d65bce4048ffe2 100644
--- a/gnome/src/codeclist.c
+++ b/gnome/src/codeclist.c
@@ -204,7 +204,7 @@ void codec_list_move_codec_down(guint codec_index, GQueue **q)
 
 }
 
-void codec_list_update_to_daemon(account_t *acc)
+void codec_list_update_to_daemon(const account_t *acc)
 {
     // Length of the codec list
     int length = g_queue_get_length(acc->codecs);
diff --git a/gnome/src/codeclist.h b/gnome/src/codeclist.h
index 242fd6eac553e909a190151f578b5c22d98bf074..bdbf95cd7e625c231e5deda4c52a828d400d991b 100644
--- a/gnome/src/codeclist.h
+++ b/gnome/src/codeclist.h
@@ -127,7 +127,7 @@ void codec_list_move_codec_down (guint index, GQueue **q);
 /**
  * Notify modifications on codecs to the server
  */
-void codec_list_update_to_daemon (account_t *acc);
+void codec_list_update_to_daemon (const account_t *acc);
 
 codec_t* codec_list_get_by_payload (gconstpointer payload, GQueue *q);
 
diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
index a70e7c502505b6fa16e14fb3ae9a1c495ad60038..8acc9c5d8ce61fa495eb4311807b27665b8c557f 100644
--- a/gnome/src/config/accountconfigdialog.c
+++ b/gnome/src/config/accountconfigdialog.c
@@ -913,7 +913,7 @@ create_network(const account_t *account)
 GtkWidget* create_published_address(const account_t *account)
 {
     GtkWidget *table, *frame;
-    gchar *use_tls =NULL;
+    gchar *use_tls = NULL;
     gchar *published_address = NULL;
     gchar *published_port = NULL;
     gchar *stun_enable = NULL;
diff --git a/gnome/src/config/accountlistconfigdialog.h b/gnome/src/config/accountlistconfigdialog.h
index 94764a5f989af1dd8282200d7999c89651cdec68..40e58526dbaab07a3ad233e8ddebdb7640eb1fb5 100644
--- a/gnome/src/config/accountlistconfigdialog.h
+++ b/gnome/src/config/accountlistconfigdialog.h
@@ -34,7 +34,7 @@
 
 #include <sflphone_const.h>
 
-void show_account_list_config_dialog (void);
-void account_list_config_dialog_fill (void);
+void show_account_list_config_dialog(void);
+void account_list_config_dialog_fill(void);
 
 #endif