Cleaned up permission conflicts
Merge pull request #577 from blrm/my-records

Cleaned up permission conflicts