Hopefully fix all user name issues.