Fix issue 63: smarter user autocompletes

Fixes issue #63.