fix identity provider concept
Merge branch 'identity' into aclapp