Changes to improve de-active user handling and creation