Fixed join issue - changing role updates correct data field