Added better user object security