Try to fix netid auth
Forgot to change the manager
Fix non-existant fields
Merge branch 'master' into neo