Added better checks to ensure users found in DB