Making custom user compatible
Updating changelog