diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl
index 4d3eaea83..bcd094928 100644
--- a/src/emqttd_message.erl
+++ b/src/emqttd_message.erl
@@ -170,7 +170,7 @@ unset_flag(Flag, Msg) when Flag =:= dup orelse Flag =:= retain -> Msg.
 %% @doc Format MQTT Message
 %% @end
 %%------------------------------------------------------------------------------
-format(#mqtt_message{msgid=MsgId, pktid = PktId, qos=Qos, retain=Retain, dup=Dup, topic=Topic}) ->
-    io_lib:format("Message(MsgId=~p, PktId=~p, Qos=~p, Retain=~s, Dup=~s, Topic=~s)",
-              [MsgId, PktId, Qos, Retain, Dup, Topic]).
+format(#mqtt_message{msgid=MsgId, pktid = PktId, from = From, qos=Qos, retain=Retain, dup=Dup, topic=Topic}) ->
+    io_lib:format("Message(MsgId=~p, PktId=~p, from=~s, Qos=~p, Retain=~s, Dup=~s, Topic=~s)",
+              [MsgId, PktId, From, Qos, Retain, Dup, Topic]).
 
diff --git a/src/emqttd_metrics.erl b/src/emqttd_metrics.erl
index 863d67676..bb96f5820 100644
--- a/src/emqttd_metrics.erl
+++ b/src/emqttd_metrics.erl
@@ -224,7 +224,7 @@ code_change(_OldVsn, State, _Extra) ->
 publish(Metric, Val) ->
     Payload = emqttd_util:integer_to_binary(Val),
     Msg = emqttd_message:make(metrics, metric_topic(Metric), Payload),
-    emqttd_pubsub:publish(Msg).
+    emqttd_pubsub:publish(emqttd_message:set_flag(sys, Msg)).
 
 create_metric({gauge, Name}) ->
     ets:insert(?METRIC_TAB, {{Name, 0}, 0});