Toggle CustomID and replace IdentityUserByUserName with an Index

Cleaned this up so now its back to where it should be