Fixes Issue #63, Smarter User Autocompletes

Cherry-picked and recreated since the original one doesn't merge for some reason.