diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 9d097fa55..2f4f75b7c 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -2395,7 +2395,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
 			      #xmlel{name = 'affiliation', attrs = Attrs} ->
 				  JID = try
 				      exmpp_jid:parse(
-					exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
+					exmpp_xml:get_attribute_from_list(Attrs, 'jid', ""))
 				  catch
 				      _:_ -> error
 				  end,
@@ -2406,7 +2406,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
 				      (Affiliation == false) ->
 					  error;
 				      true ->
-					  [{jlib:short_prepd_jid(JID), Affiliation} | Acc]
+					  [{JID, Affiliation} | Acc]
 				  end
 			  end
 		  end
@@ -2420,7 +2420,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
 			    true ->
 				lists:foreach(
 				    fun({JID, Affiliation}) ->
-					node_call(Type, set_affiliation, [NodeId, JID, Affiliation]),
+					{result, _} = node_call(Type, set_affiliation, [NodeId, JID, Affiliation]),
 					case Affiliation of
 					    owner ->
 						NewOwner = jlib:short_prepd_bare_jid(JID),
diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index 4eb866cd0..1fe51b38d 100644
--- a/src/mod_pubsub/node_hometree.erl
+++ b/src/mod_pubsub/node_hometree.erl
@@ -619,7 +619,7 @@ get_affiliation(NodeId, Owner) ->
     GenState = get_state(NodeId, GenKey),
     {result, GenState#pubsub_state.affiliation}.
 
-set_affiliation(NodeId, Owner, Affiliation) ->
+set_affiliation(NodeId, Owner, Affiliation) when ?IS_JID(Owner)->
     GenKey = jlib:short_prepd_bare_jid(Owner),
     GenState = get_state(NodeId, GenKey),
     case {Affiliation, GenState#pubsub_state.subscriptions} of