I was thinking the same way. Clicking on the user to get additional options feels unnatural. Either of your suggestions would work.