Refactoring: User access loophole and improving control of user access.