Changed username to userId