Fixed current_user index