Device Detection problem

Hello,

We have deployed Fortigate 60E, but having problems with Device Detection in LAN interface. Any Windows client computer that have windows file sharing enabled is considered Samba Server. Is there a way to specify it as client not as server. The other problem is that the user is identified as workstation domain account not as the actual user that is using the computer at the moment. We have deployed FSSO and it is detecting the users properly but they are not properly populated in the Device Inventory.