Melanie's changes

Fixed the keyerror in userDict

Fixed the check for users not in the org
Fixed the check for non standard folders