diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0a0f9f24..32c50d43 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,93 +1,118 @@
 {
-    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js?id=45d7e5434df0aecfb75f",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js?id=3cebd29d3da07a4c05b3",
-    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js?id=fa0e58359856d9130736",
-    "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=011ce4838e92b1305062",
-    "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js?id=90ab4213c8bc4f2dc49c",
-    "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=1821f82af383dfa66b44",
-    "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=b12439bd716b954a8c85",
-    "/chunks/admin.js": "/chunks/admin.js?id=6651ac701af49d31f446",
-    "/chunks/dashboard~chunks/dashboard-oasis.js": "/chunks/dashboard~chunks/dashboard-oasis.js?id=d293faf181dee7b2f16f",
-    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=a86fb952ff091cb75302",
-    "/js/main.js": "/js/main.js?id=e24249a1604dd3b56be9",
-    "/css/app.css": "/css/app.css?id=b1fc602730eb3f4c9e6e",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=2423b39e710cb3ca960e",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=f35ee7159e406d0872e3",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=181cfe1c7cfa5f9bd6d9",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=9a2a5bb99759f34a4d6e",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=43da97f81dfe83e1741e",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=49e12163fded858bdc8a",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=b758fce43fbcbbe60570",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=54c7b0884601a8d53d7f",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=670fa78fbf081ed2e5d0",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c33cebbfb2deba113cd6",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=dd34a8eca7e9148dc00f",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=4a3d11afbbdf1f0ce00b",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=de009cbd9120153b8d77",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=5ec1163c6c6c2fe76164",
-    "/chunks/dashboard-oasis.js": "/chunks/dashboard-oasis.js?id=b26c3869ca423c97a518",
-    "/chunks/database.js": "/chunks/database.js?id=ad83e1ef292d55ce0f60",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=b7631d625e19e6379379",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=56221f707c25a1443d3f",
-    "/chunks/files.js": "/chunks/files.js?id=398f44112c8a6b2f0375",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=6a6c6e4a054c182e7f1b",
-    "/chunks/homepage.js": "/chunks/homepage.js?id=30c1da2c5a7c50433408",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=b9e17524a42dadd47933",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=3548624f826db0791cdc",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=161b237a59f7b12cbebb",
-    "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a598b376469d974e69b9",
-    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=3fb406bff48c1fd1b935",
-    "/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=4d532deff5f73e453f14",
-    "/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=b10ec393290687809a9e",
-    "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=7e790f07e34503e77f17",
-    "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=67c008dfcaa34b486f0a",
-    "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=aed66de56a7fcf1944c6",
-    "/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=c97c8f1c05c94ad0a696",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=2a8fdf19b4d5ba654b50",
-    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=bcdcaecdc07a887873ba",
-    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=d4995d5732c2ced6044b",
-    "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=7a1fc14cedf369d5767c",
-    "/chunks/oasis/upgrade-billing.js": "/chunks/oasis/upgrade-billing.js?id=7b8c3ed338b3527de92d",
-    "/chunks/oasis/upgrade-plan.js": "/chunks/oasis/upgrade-plan.js?id=87e5e1f6a9c8b95aeeb8",
-    "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=2e2f854eefca3a312e8b",
-    "/chunks/oasis/users.js": "/chunks/oasis/users.js?id=4f848eaf4234cd759316",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=5fff761a6746d936d67c",
-    "/chunks/pages.js": "/chunks/pages.js?id=9e9769b8076198daeeb3",
-    "/chunks/plan.js": "/chunks/plan.js?id=4b97d06a46ac3c9de837",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=999e93aa2a566f14ed8d",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=ea0eed6cccee2a1a8ddf",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=1126e53c651aaea7bbdc",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=978075c87b6e885b9d58",
-    "/chunks/plans.js": "/chunks/plans.js?id=860196d2bf0e816291c0",
-    "/chunks/platform.js": "/chunks/platform.js?id=b6bdb0cd2f9b7b8d4855",
-    "/chunks/profile.js": "/chunks/profile.js?id=8ba097ae5c969050df27",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=2940170085b46476ab39",
-    "/chunks/settings.js": "/chunks/settings.js?id=e49f2144f30dc33545cb",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0344848f745ed16ad175",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=9c1eb9c787807866a63c",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=ba333a68c637a3f6bbae",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=71af14ca9f35110a9198",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=54ac9fe7a40b03b8932a",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=caa3e2abd06f1ace1e86",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=d0353ac99122ce69fb7f",
-    "/chunks/shared.js": "/chunks/shared.js?id=7dcc6c332352c5187327",
-    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=04ebff113f0a9ea98b8f",
-    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=492256744959318a776b",
-    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=3709b1398e729b0ebd8a",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=dd4ced4cf62bc48f659e",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=0b5fc9e3bc1ca36bddb3",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=a76f57dd4c84fa0061e1",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=c4548079020bbe1ab0dd",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=17df1a56d18f7e86e3c7",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=27802eb733b20a9b7788",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=c2260d7040c92a985d2a",
-    "/chunks/user.js": "/chunks/user.js?id=15386bc49540b6c82629",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=69e2414aee55a442ecb6",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=0db4e265ccc87fc88b29",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=f754db9616ad15281b68",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=11dd361e6030eeca9124",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=172c0c1f0d182b115932",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=12cc6d01aa23b8119c7c",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=b2e3257a0cfa8ad13358",
-    "/chunks/users.js": "/chunks/users.js?id=b69d1f8566bad80dcf7e"
+    "/js/main.js": "/js/main.js",
+    "/css/app.css": "/css/app.css",
+    "/chunks/admin.js": "/chunks/admin.js?id=d86031c08c766c57c560",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=d847711ea909fed8e159",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~e360f8a1.js?id=1bbcaf665352a31cdd47",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~0ee95e5e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~0ee95e5e.js?id=629983642666dd5d1fe0",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~56ae6336.js?id=17ba3413d7664a85b496",
+    "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~d177b2e8.js?id=d8e5c838192145431184",
+    "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared/file-browser.js?id=fec368535579f906d370",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=ca01b6445d265bd370c5",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=178176f96e347c132782",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=52e28f0bace9213f02d5",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~262a2a36.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~262a2a36.js?id=63b06bf13f0dfef0ea03",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~2e0b85bd.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~2e0b85bd.js?id=20f9f78ad134fad90920",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~c329baf3.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~c329baf3.js?id=45cb17f70d5fd70d31ef",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=f1365aa38556534b1273",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=78c9798eb733cd90497e",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=0b6211ae97e522ea216a",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=32ed09b080ba2044402f",
+    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~93101a7f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~93101a7f.js?id=7783f73d267a0b0396e9",
+    "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~78bb4d4b.js": "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~78bb4d4b.js?id=a407f34f10577b052991",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=16abcaf2da31db60b01d",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=14f854cb9a60e93a24bb",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=d57e806c59d1aef2eb3a",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=3cb62e40a228b42509c5",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=061654ae551b5e033adb",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=035c0d13db99b12aacab",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=2a8def187ec322eb760e",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=72d02c781aa8e6295069",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=bdc04c67baf9f75b1007",
+    "/chunks/dashboard-oasis.js": "/chunks/dashboard-oasis.js?id=4a778d0ae431f9df28b6",
+    "/chunks/dashboard~chunks/dashboard-oasis.js": "/chunks/dashboard~chunks/dashboard-oasis.js?id=aeb40749d79d54e82faa",
+    "/chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chunks/oasis/invoices/client-invoices~chunks~4ba83fa1.js": "/chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chunks/oasis/invoices/client-invoices~chunks~4ba83fa1.js?id=ad2e711816d6ad16f255",
+    "/chunks/database.js": "/chunks/database.js?id=99b9ed1c383487394786",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=c93fa78bafae82c930f7",
+    "/chunks/dynamic-page~chunks/oasis/homepage.js": "/chunks/dynamic-page~chunks/oasis/homepage.js?id=c57ba03898734ecdeeaa",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=21a0656c96b0a3aede3e",
+    "/chunks/files.js": "/chunks/files.js?id=54c6dddb471986e202f3",
+    "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~32471b3c.js": "/chunks/files~chunks/oasis/invoices/list~chunks/oasis/platba~chunks/settings-subscription~chunks/shar~32471b3c.js?id=adc0f4884571c6a6e64d",
+    "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/platform~chunks/shared/file-browser.js?id=e3ef07ea10646eb3c2d8",
+    "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js": "/chunks/files~chunks/oasis/invoices/list~chunks/shared/file-browser.js?id=b49b163e63c1001c2a22",
+    "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js": "/chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared~chunks/s~40cda2f4.js?id=80ee9a132bbaf48cd643",
+    "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/s~3fd62fd8.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/s~3fd62fd8.js?id=a83f70e981ffb91bf783",
+    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=c664d5939b746489f57a",
+    "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=7eddd0ae060b28e7b6b2",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=96019e230f0c5b59478a",
+    "/chunks/homepage.js": "/chunks/homepage.js?id=aa7800b775bbed40d5f8",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=88e886614e517df95f2d",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=44cc3fb563e6711fcf9f",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=4ead3393f11e9d24a662",
+    "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=93ffce5707ae92e73570",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=52cbf342ca2600db8b22",
+    "/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=5f6d3da1b11ef17294eb",
+    "/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=2acbe292c3671f3dbf55",
+    "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=d393bc04694023a2591b",
+    "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=c4d22f8f40db80976b36",
+    "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=cbbae0edf3b798f0d15d",
+    "/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=c76667aef7b9344fa0d5",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=b138f14c38c3a9f7d75a",
+    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=c552dc38756ae53a6f23",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=4f78c954ea35727cfa9f",
+    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=cf99bcf3f3cff5b7ad69",
+    "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=c53e36ab93aeeba462b4",
+    "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=e01fc4a2286d449d0cd4",
+    "/chunks/oasis/upgrade-billing.js": "/chunks/oasis/upgrade-billing.js?id=87fab0c7fe56d23c1492",
+    "/chunks/oasis/upgrade-plan.js": "/chunks/oasis/upgrade-plan.js?id=1a80872b92984de3a9b8",
+    "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=922fd4a44d0c05cf35b3",
+    "/chunks/oasis/users.js": "/chunks/oasis/users.js?id=3f49e83eed798e59a29b",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=a11d45d67a158400a5af",
+    "/chunks/pages.js": "/chunks/pages.js?id=b2dc1026f393dbe10db0",
+    "/chunks/plan.js": "/chunks/plan.js?id=c4cc3da1bedaa9139087",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=069689c6d6c3d3aef13d",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=d2694eb1f42ada78f34b",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=88c1d762bfc92726a6fe",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=672b287aae649c4fc08c",
+    "/chunks/plans.js": "/chunks/plans.js?id=140061eb187550dce8e4",
+    "/chunks/platform.js": "/chunks/platform.js?id=1edddebab7aab07cdb24",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=1a550670d2f8cd9c381b",
+    "/chunks/profile.js": "/chunks/profile.js?id=52fdc00ce8194be4f943",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=da15fd2bd24f6d5692fd",
+    "/chunks/settings.js": "/chunks/settings.js?id=fbe0879c964284758519",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=b6decb122f2d2454adc1",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=b2fdd3b946a2ea920f40",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=97241b6964289ef22fcc",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=76fcb03d41f234ea13ab",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=205839092515f764dd7c",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=466cc0d9c3c48f6f4516",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=41d3478184ec24644a1c",
+    "/chunks/shared.js": "/chunks/shared.js?id=7524b7a783d4aed23794",
+    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=a5043b64b9859061a3df",
+    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=0f6c34512740fca7e007",
+    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=7886247bb35deada28a2",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=cc9edae9166e2b43c080",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=65be3ab550d14c19e9ce",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=0ce8f8dbc42b3dad1ab1",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=c4d3b3885ac550e97073",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=5aac1b431f388f3e0c39",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=1f47f8e80a14dd5b820a",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=17d6daf8f7e6af5a371e",
+    "/chunks/user.js": "/chunks/user.js?id=0030fee02d16f9894ee9",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=6a81ff04dcbe9fb41a3a",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=492f2aa0b3abf53d9d88",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=2c1f58c79029a752796c",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=5e6b460667499eb209b7",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=b4a1c1a307140a0e67f2",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=3cc41c1e52b09a549cc1",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=8212c6601fe916528ee6",
+    "/chunks/users.js": "/chunks/users.js?id=68826752ad686a5c0b0a",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~4509a016.js?id=c708d0d8324c04a73bff",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~66c4fa45.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~66c4fa45.js?id=a90d02375626aeb98cba",
+    "/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~~b42d96c6.js": "/vendors~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared/file-browser~~b42d96c6.js?id=052d693d0460936fcf73",
+    "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/vendors~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=9b089a73923448db1f5f",
+    "/chunks/oasis/invoices/create-invoice.97b77988eee48530cccf.hot-update.js": "/chunks/oasis/invoices/create-invoice.97b77988eee48530cccf.hot-update.js",
+    "/chunks/oasis/invoices/edit-invoice.9e5bc6856386a41b8dd1.hot-update.js": "/chunks/oasis/invoices/edit-invoice.9e5bc6856386a41b8dd1.hot-update.js",
+    "/chunks/oasis/invoices/edit-invoice.9556197d2dd8e02fc4de.hot-update.js": "/chunks/oasis/invoices/edit-invoice.9556197d2dd8e02fc4de.hot-update.js",
+    "/chunks/oasis/invoices/edit-invoice.a47a4a7b6356ea285c13.hot-update.js": "/chunks/oasis/invoices/edit-invoice.a47a4a7b6356ea285c13.hot-update.js"
 }
diff --git a/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue b/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
index 4568df27..ab314140 100644
--- a/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
+++ b/resources/js/Oasis/Invoices/Invoices/CreateInvoice.vue
@@ -511,12 +511,6 @@
 			}
 		},
 		watch: {
-			isDiscount(val) {
-				if (!val) {
-					this.invoice.discount_rate = 10
-					this.invoice.discount_type = 'percent'
-				}
-			},
 			'invoice.invoice_number': function (val) {
 				this.invoice.variable_number = val
 			},
diff --git a/resources/js/Oasis/Invoices/Invoices/EditInvoice.vue b/resources/js/Oasis/Invoices/Invoices/EditInvoice.vue
index 41ee6ec4..064e5d3c 100644
--- a/resources/js/Oasis/Invoices/Invoices/EditInvoice.vue
+++ b/resources/js/Oasis/Invoices/Invoices/EditInvoice.vue
@@ -416,14 +416,6 @@
 				return total
 			}
 		},
-		watch: {
-			isDiscount(val) {
-				if (!val) {
-					this.invoice.discount_rate = null
-					this.invoice.discount_type = null
-				}
-			},
-		},
 		data() {
 			return {
 				fullDetails: undefined,
@@ -543,13 +535,14 @@
 					})
 			},
 			addRow() {
-				let lastTaxRate = this.invoice.items.slice(-1).pop()
+				let lastItem = this.invoice.items.slice(-1).pop()
 
 				this.invoice.items.push({
 					id: Math.floor(Math.random() * 10000000),
 					description: '',
 					amount: 1,
-					tax_rate: lastTaxRate?.tax_rate || 21,
+					unit: lastItem?.unit || this.$t('in_editor.default_unit'),
+					tax_rate: lastItem?.tax_rate || 21,
 					price: 1,
 				})