Register Fix and User Index Fix