SCA-36 SCA-21 added mapping username to user's name

caching doesn't work though, making it a lil slow