Fix bug where get_fieldsets is called twice

* If get_fieldsets is called twice, the 'is_active' field will already
  have been replaced by ('is_active', 'email_verification_required')
* Reverts 49105af
* Update CHANGELOG