Reduced 9 queries on login to 4