BS-10642 - Fix user permission check