Company- and username

Version: 5.0.3 (Git commit: e21dc6a)