Fixed userindex

Merge caused issues.. fixing small details