Add username field and language