Merge pull request #8849 from MrPetovan/task/8846-console-user-tweaks