Fix user activation field
Refactor the users addons