Guest permission cleanup (fixes #906)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #908 from Oldiesmann/release-2.1

Guest permission cleanup (fixes #906)