Fixes batch option on users - see Tracker 30216

Incorporates JM's patch and fixes misplaced ending div tag