diff --git a/ChangeLog b/ChangeLog
index 9d210be61..ac23630cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29  Alexey Shchepin  <alexey@process-one.net>
+
+	* src/mod_roster.erl: Fixed "from" attribute in roster pushes
+	* src/mod_roster_odbc.erl: Likewise
+
 2008-02-28  Badlop  <badlop@process-one.net>
 
 	* src/ejabberd_app.erl (prep_stop): Stop modules when stopping
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 3ba6949a4..f33dd3613 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -497,7 +497,7 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) ->
 			    ok;
 			true ->
 			    push_item(User, Server,
-				      jlib:make_jid("", Server, ""), Item)
+				      jlib:make_jid(User, Server, ""), Item)
 		    end,
 		    true;
 		none ->
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 8248f1dd9..bfec73b33 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -558,7 +558,7 @@ process_subscription(Direction, User, Server, JID1, Type, Reason) ->
 			    ok;
 			true ->
 			    push_item(User, Server,
-				      jlib:make_jid("", Server, ""), Item)
+				      jlib:make_jid(User, Server, ""), Item)
 		    end,
 		    true;
 		none ->