User entity fix, composer update