Use GID instead of Confirmation number

This is updates for Hollywood - and to correctly modify a user record.
added back include