Updates for CoD4X18 and merged user/auth system a bit