Certainly an improvement. Just a comment - in addition to the format, the user name may also be in the domain\user format so that should be checked for as well.