Improved user enforcing
2 files changed