diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c
index 90bffd80..95a051f0 100644
--- a/src/irc/core/irc-cap.c
+++ b/src/irc/core/irc-cap.c
@@ -81,25 +81,25 @@ static void cap_emit_signal (IRC_SERVER_REC *server, char *cmd, char *args)
 
 static gboolean parse_cap_name(char *name, char **key, char **val)
 {
+	const char *eq;
+
 	g_return_val_if_fail(name != NULL, FALSE);
 	g_return_val_if_fail(name[0] != '\0', FALSE);
 
-	const char *eq = strchr(name, '=');
+	eq = strchr(name, '=');
 	/* KEY only value */
 	if (eq == NULL) {
 		*key = g_strdup(name);
 		*val = NULL;
 		return TRUE;
-	}
 	/* Some values are in a KEY=VALUE form, parse them */
-	else if (eq[1] != '\0') {
+	} else if (eq[1] != '\0') {
 		*key = g_strndup(name, (gsize)(eq - name));
 		*val = g_strdup(eq + 1);
 		return TRUE;
-	}
 	/* If the string ends after the '=' consider the value
 	 * as invalid */
-	else {
+	} else {
 		*key = NULL;
 		*val = NULL;
 		return FALSE;
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 3b4e1a52..e154d17f 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -444,8 +444,8 @@ static void sig_disconnected(IRC_SERVER_REC *server)
 	server->cap_active = NULL;
 
 	if (server->cap_supported) {
-	    g_hash_table_destroy(server->cap_supported);
-	    server->cap_supported = NULL;
+		g_hash_table_destroy(server->cap_supported);
+		server->cap_supported = NULL;
 	}
 
 	gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);