pre-migration changes - configuration and signup form changes

PRE-MIGRATION CHANGES - configuration and signup form changes