Changed the way users are fetched back to username