Fixed bug with user validation
Optimized some queries with eager loading