Closes #475
Fixes issue with Edit Permissions button.
Merges issue 475 work into 2.1final branch.