Support sites with usernames, closes #5