This is relevant for the case that the organization
name is empty.

Change-Id: Ib638c29610b7c268886602609368bb03f120c14e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>