Fix permission bugs
Merge pull request #189 from CruGlobal/MH-750

Fix permission bugs