Fix for r85876 by doing away with a potentially invalid user name parameter behind...