Advanced app `User` model code style fixes
Merge pull request #4246 from creocoder/advanced-app-user-model-code-style-fixes

Advanced app `User` model code style fixes