Think I've fixed the user index bug