moved the setting of default properties

just so it’s form dependant, not Entity dependant