modifyClient implemented.
Activate account in addition to user during activation.
Fix activation

* Set user not expired and locked.
* Grant user role
Token both activates account and changes password

* A token during modify account will both activate an inactive account
and if a modified password is present instead of either just
activating/reseting password and not both.
Reset Password: Throw error if token present but password missing

* Indicates to the user there is a problem.