Added extra checks if user exist to match correct user.