Merge branch '6369-user-default-active' into 'develop'

Set a default for newly created users to be active, fixes #6369

Closes #6369

See merge request !1620