Fix to entities + user account registration update