(no-ticket) Fix generating ids in forms labels

Change-Id: Id646174072ab1b1ee4cb032942d3ec1e53c0a5d7