diff --git a/src/mpd_client.c b/src/mpd_client.c
index 640b837..ee49c84 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -219,8 +219,9 @@ out_host_change:
             if(mpd.password)
                 free(mpd.password);
 
-            mpd.password = token;
+            mpd.password = strdup(token);
             mpd.conn_state = MPD_RECONNECT;
+            free(p_charbuf);
             return MG_TRUE;
 out_set_pass:
             free(p_charbuf);