Fix issue with creating user accounts