use usernames instead of user id
Merge branch 'fix_usernames'