Make sure correct users are referenced.

Closes #24