Feature/issue 382 rebased

Fix for incorrect changes for user joining populated channel