diff --git a/src/mod_applepush.erl b/src/mod_applepush.erl
index 18b8dd2b0..5e97f6165 100644
--- a/src/mod_applepush.erl
+++ b/src/mod_applepush.erl
@@ -215,6 +215,7 @@ receive_offline_packet(From, To, Packet) ->
 				end,
 			    Badge = integer_to_list(Offline + 1),
 			    DeviceID = erlang:integer_to_list(ID, 16),
+			    STo = jlib:jid_to_string(To),
 			    Packet1 =
 				{xmlelement, "message", [],
 				 [{xmlelement, "push", [{"xmlns", ?NS_P1_PUSH}],
@@ -227,7 +228,9 @@ receive_offline_packet(From, To, Packet) ->
 				    {xmlelement, "sound", [],
 				     [{xmlcdata, SSound}]},
 				    {xmlelement, "from", [],
-				     [{xmlcdata, SFrom}]}]}]},
+				     [{xmlcdata, SFrom}]},
+				    {xmlelement, "to", [],
+				     [{xmlcdata, STo}]}]}]},
 			    ejabberd_router:route(To, ServiceJID, Packet1)
 		    end
 	    end;
diff --git a/src/mod_applepush_service.erl b/src/mod_applepush_service.erl
index b2d3251ac..425da7aac 100644
--- a/src/mod_applepush_service.erl
+++ b/src/mod_applepush_service.erl
@@ -370,7 +370,7 @@ handle_message(From, To, Packet, State) ->
 		      "Device ID: ~s~n",
 		      [State#state.host, erlang:integer_to_list(ID, 16),
 		       Notification, Payload,
-		       jlib:jid_to_string(From),
+		       Sender,
 		       Receiver, DeviceID]),
 	    case ssl:send(State#state.socket, Notification) of
 		ok ->