DAIR modifications for admin user
Merge pull request #1 from Chealion/master

DAIR modifications for admin user