Company- and username

Version: 4.12.2 (Git commit: 8b5b594)