Added field checks for account claim