Fix passing identity.
Fix broken contents tag

Bug: 12545
Signed-off-by: Jan Schneider <jan@horde.org>