Improve user related messages
Merge pull request #1408 from stuntguy3000/patch05

Improve user related messages