Add fix for users in policies

Working on #60