Temporary fix to user registration
Merge branch 'master' into feat/filters
Updated