Limits U and O entries size
Merge pull request #3951 from yurydelendik/limit-pwd

Limits U and O entries size