Added username and id on scope