Fix throttling code.

Fix bug in last commit, and switch to username only throttling function
after discussion with content team.