Fix setup application data

Emily Lancietti requested to merge fix_setup_application_data into master Apr 22, 2021