WDS 2013 questions

Hi all,

I have 2 problems with WDS 2013 that I need some help with. I'm deploying Windows 7 (OEM until the VL license is in place very soon, so no comments on that pls.!)

Let's start with the customsettings.ini:

[Settings]
Priority=DefaultGateway,Manufacturer,Default

[DefaultGateway]
192.168.31.1=SiteA
192.168.32.1=SiteB
192.168.33.1=SiteC
192.168.34.1=SiteD

[SiteA]
OSDComputerName=PC-A-
MachineObjectOU=OU=SiteA,OU=Workstations,OU=Computers,OU=Managed,DC=domain,DC=local

[SiteB]
OSDComputerName=PC-B-
MachineObjectOU=OU=SiteB,OU=Workstations,OU=Computers,OU=Managed,DC=domain,DC=local

[SiteC]
OSDComputerName=PC-C-
MachineObjectOU=OU=SiteC,OU=Workstations,OU=Computers,OU=Managed,DC=domain,DC=local

[SiteD]
OSDComputerName=PC-D-
MachineObjectOU=OU=SiteD,OU=Workstations,OU=Computers,OU=Managed,DC=domain,DC=local

[Manufacturer]
Dell Inc.=Dell
Hewlett Packard=HP
LENOVO=Lenovo
Microsoft Corporation=Microsoft

[Dell]
ProductKey=32KD2-K9CTF-M3DJT-4J3WC-733WD

[HP]
ProductKey=74T2M-DKDBC-788W3-H689G-6P6GT

[Lenovo]
ProductKey=237XB-GDJ7B-MV8MH-98QJM-24367

[Default]
_SMSTSOrgName=Running %TaskSequenceID% on %OSDComputername%
KeyboardLocale=0406:00000406
OSInstall=Y

Question 1:

According to the Gateway we pre-set the OSDComputerName with a name according to the naming convention. Later in the task sequence a number manually added (e.g. PC-A-321) 

Notice _SMSTSOrgName=Running %TaskSequenceID% on %OSDComputername%

When the TS are running I only see "Running .... on PC-A-" and not "Running ... on PC-A-321".

I have tried to update _SMSTSOrgName in a task sequence, but it is not reflected in the UI.

So how do it make the UI reflect the update of the %OSDComputername% with the value manually entered?

Question 2:

I try to detect the Manufacturer and set the OEM license key (they are public SLP license keys). It does not seem to work.

If I manually create a task sequence for each OEM vendor and add the license key during the TS setup it works.

What am I doing wrong?

Thank you for any input!