diff --git a/web/src/Setting.js b/web/src/Setting.js
index eade2370..30a4bd58 100644
--- a/web/src/Setting.js
+++ b/web/src/Setting.js
@@ -83,7 +83,7 @@ export function getAllPromptedProviderItems(application) {
 }
 
 export function getSignupItem(application, itemName) {
-  const signupItems = application.signupItems.filter(signupItem => signupItem.name === itemName);
+  const signupItems = application.signupItems?.filter(signupItem => signupItem.name === itemName);
   if (signupItems.length === 0) {
     return null;
   }
diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js
index a3a526c6..cbb1339e 100644
--- a/web/src/auth/SignupPage.js
+++ b/web/src/auth/SignupPage.js
@@ -402,7 +402,7 @@ class SignupPage extends React.Component {
         >
         </Form.Item>
         {
-          application.signupItems.map(signupItem => this.renderFormItem(application, signupItem))
+          application.signupItems?.map(signupItem => this.renderFormItem(application, signupItem))
         }
         <Form.Item {...tailFormItemLayout}>
           <Button type="primary" htmlType="submit">
diff --git a/web/src/backend/ApplicationBackend.js b/web/src/backend/ApplicationBackend.js
index a85500f5..1d795f63 100644
--- a/web/src/backend/ApplicationBackend.js
+++ b/web/src/backend/ApplicationBackend.js
@@ -46,6 +46,7 @@ export function updateApplication(owner, name, application) {
 
 export function addApplication(application) {
   let newApplication = Setting.deepCopy(application);
+  newApplication.organization = "built-in"
   return fetch(`${Setting.ServerUrl}/api/add-application`, {
     method: 'POST',
     credentials: 'include',