diff --git a/ChangeLog b/ChangeLog
index baabf530d..7d3420324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,11 @@
 
 	* src/web/ejabberd_web_admin.erl: More flexible parsing the shared
 	roster members list from the configuration form.
-	* src/mod_shared_roster.erl: Delete the shared roster group now
-	correctly delete its user entries.
+	* src/mod_shared_roster.erl: Deletng a shared roster group now
+	correctly deletes its user entries.
+
+	* src/mod_shared_roster.erl: The logged user (self) is now removed from
+	the shared roster list.
 
 2006-06-19  Alexey Shchepin  <alexey@sevcom.net>
 
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 711cae25f..7477d31c9 100644
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -75,14 +75,22 @@ stop(Host) ->
 get_user_roster(Items, US) ->
     {U, S} = US,
     DisplayedGroups = get_user_displayed_groups(US),
+    %% Get shared roster users in all groups and remove self: 
     SRUsers = 
 	lists:foldl(
 	  fun(Group, Acc1) ->
 		  lists:foldl(
 		    fun(User, Acc2) ->
-			    dict:append(User, get_group_name(S, Group), Acc2)
+			    if User == US -> Acc2;
+			       true -> dict:append(User, 
+						   get_group_name(S, Group),
+						   Acc2)
+			    end
 		    end, Acc1, get_group_users(S, Group))
 	  end, dict:new(), DisplayedGroups),
+
+    %% If partially subscribed users are also in shared roster, show them as
+    %% totally subscribed:
     {NewItems1, SRUsersRest} =
 	lists:mapfoldl(
 	  fun(Item, SRUsers1) ->
@@ -96,6 +104,8 @@ get_user_roster(Items, US) ->
 			  {Item, SRUsers1}
 		  end
 	  end, SRUsers, Items),
+    
+    %% Export items in roster format:
     SRItems = [#roster{usj = {U, S, {U1, S1, ""}},
 		       us = US,
 		       jid = {U1, S1, ""},