usernames can no longer contain upper-case letters or non-word characters
resolved merge conflicts