LP#1849212: (follow-up) fixes to removing users from course