updated userId to username in tokenWrapper