diff --git a/src/config/accounts.c b/src/config/accounts.c
index 0060b471..9d684e54 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -217,10 +217,10 @@ accounts_add(const char* account_name, const char* altdomain, const int port, co
     autocomplete_add(enabled_ac, account_name);
 }
 
-int
+gboolean
 accounts_remove(const char* account_name)
 {
-    int r = g_key_file_remove_group(accounts, account_name, NULL);
+    gboolean r = g_key_file_remove_group(accounts, account_name, NULL);
     _accounts_save(account_name);
     autocomplete_remove(all_ac, account_name);
     autocomplete_remove(enabled_ac, account_name);
@@ -294,7 +294,7 @@ accounts_get_account(const char* const account_name)
             if (conn_status == JABBER_CONNECTED) {
                 const char* conf_jid = connection_jid_for_feature(XMPP_FEATURE_MUC);
                 if (conf_jid) {
-                    muc_service = strdup(conf_jid);
+                    muc_service = g_strdup(conf_jid);
                 }
             }
         }
diff --git a/src/config/accounts.h b/src/config/accounts.h
index d72ebac2..679d7942 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -48,7 +48,7 @@ char* accounts_find_enabled(const char* const prefix, gboolean previous, void* c
 void accounts_reset_all_search(void);
 void accounts_reset_enabled_search(void);
 void accounts_add(const char* jid, const char* altdomain, const int port, const char* const tls_policy, const char* const auth_policy);
-int accounts_remove(const char* jid);
+gboolean accounts_remove(const char* jid);
 gchar** accounts_get_list(void);
 ProfAccount* accounts_get_account(const char* const name);
 gboolean accounts_enable(const char* const name);