diff --git a/cookiecutter.json b/cookiecutter.json
index 5dbdf02..1b5494d 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -5,14 +5,14 @@
     "project_name_slug": "",
     "project_description": "",
     "product_name": "{{ cookiecutter.project_name }}",
-    "org_name": "{{ cookiecutter.org_name if cookiecutter.org_name else cookiecutter.bundle_id.rsplit('.', 1)[0] if cookiecutter.bundle_id else 'com.flet' }}",
+    "org_name": "{{ cookiecutter.org_name if 'org_name' in cookiecutter else cookiecutter.bundle_id.rsplit('.', 1)[0] if 'bundle_id' in cookiecutter else 'com.flet' }}",
     "company_name": "Your Company",
     "copyright": "Copyright (c) 2023 Your Company",
     "flutter": null,
     "sep": "/",
     "hide_loading_animation": true,
-    "bundle_id": "{{ cookiecutter.bundle_id if cookiecutter.bundle_id else cookiecutter.org_name + '.' + cookiecutter.project_name }}",
-    "package_name": "{{ cookiecutter.bundle_id.rsplit('.', 1)[-1].replace('-', '_') if cookiecutter.bundle_id else cookiecutter.project_name }}",
+    "bundle_id": "{{ cookiecutter.bundle_id if 'bundle_id' in cookiecutter else cookiecutter.org_name + '.' + cookiecutter.project_name }}",
+    "package_name": "{{ cookiecutter.bundle_id.rsplit('.', 1)[-1].replace('-', '_') if 'bundle_id' in cookiecutter else cookiecutter.project_name }}",
     "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.package_name }}{{ cookiecutter.sep }}",
     "base_url": "/",
     "route_url_strategy": "path",