fixed Username being undefined