Fixes to users-jpa