Pull request to update LoginMessage into master repository

From my branch3.