Fix issue with underscores in user name
Change input padding