Improve UserPassword message