[Users] upgrade to latest master not working