Company- and username

Version: 5.4.0 (Git commit: c9e5c5b)