NAS-Port-Type condition UM7

Can User Manager in RouterOS 7 check condition NAS-Port-Type and filter requests based on it (basically, like the NPS do)?
Problem is using different users for multiple services (IPSec and WiFi) and using 1 RADIUS server on ROS7. If authentication method matches (EAP TLS), user, created for WiFi can authenticate in VPN. I created attribute NAS-Port-Type (packet type Access-Accept) and add it to user groups, but it doesn’t seem to work.
My problem is similar to http://forum.mikrotik.com/t/user-manager-7-user-binding-route-help-help-help/157722/1