diff --git a/app/Http/Controllers/Oasis/InvoiceController.php b/app/Http/Controllers/Oasis/InvoiceController.php
index 06ac5676..e92c5872 100644
--- a/app/Http/Controllers/Oasis/InvoiceController.php
+++ b/app/Http/Controllers/Oasis/InvoiceController.php
@@ -216,9 +216,7 @@ class InvoiceController extends Controller
                     'value' => $client->id,
                 ];
             }),
-            'isVatPayer' => $user->invoiceProfile->ic_dph
-                ? true
-                : false,
+            'isVatPayer' => $user->invoiceProfile->ic_dph ?? false,
             'latestInvoiceNumber' => $user->regularInvoices->first()
                 ? (int) $user->regularInvoices->first()->invoice_number
                 : null,
diff --git a/app/Http/Controllers/Oasis/InvoiceProfileController.php b/app/Http/Controllers/Oasis/InvoiceProfileController.php
index a8df2d3f..91ce7bb2 100644
--- a/app/Http/Controllers/Oasis/InvoiceProfileController.php
+++ b/app/Http/Controllers/Oasis/InvoiceProfileController.php
@@ -17,10 +17,17 @@ class InvoiceProfileController extends Controller
      */
     public function show()
     {
-        return response(
-            new InvoiceProfileResource(Auth::user()->invoiceProfile),
-            200
-        );
+        $user = Auth::user();
+
+        if ($user->invoiceProfile) {
+
+            return response(
+                new InvoiceProfileResource($user->invoiceProfile),
+                200
+            );
+        }
+
+        return response("Profile didn't exists", 404);
     }
 
     /**
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index ef6139e8..094d2edc 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -30,6 +30,9 @@ class UserResource extends JsonResource
                     'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
                     'created_at' => $this->created_at,
                     'updated_at' => $this->updated_at,
+
+                    // OasisDrive
+                    'has_billing_profile' => $this->invoiceProfile ? true : false,
                 ],
                 'relationships' => [
                     'settings' => [
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 57cacddf..e42024ef 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -8,7 +8,7 @@
     "/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=3500df10c19053acd77b",
     "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~f205bd67.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/sh~f205bd67.js?id=94e67ef1eef94f3de4a7",
     "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared-files~chunks/shared/fi~41abd910.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/settings~chunks/shared-files~chunks/shared/fi~41abd910.js?id=c804f9bf9138c4da52e9",
-    "/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=cb303b17a97eae5e5eb2",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.js?id=fc287552563b5b5c2136",
     "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=a7e1f2b5096c12b0d23a",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=18f8d651b94fbd837c54",
     "/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=e6505b93727b56256f92",
@@ -30,7 +30,7 @@
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=48dc53ccbd502c2739ec",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=55a783975e40f9dcf31b",
     "/chunks/dashboard-oasis.js": "/chunks/dashboard-oasis.js?id=8b37095a96ece7d6c1d8",
-    "/chunks/dashboard~chunks/dashboard-oasis.js": "/chunks/dashboard~chunks/dashboard-oasis.js?id=bdef93a4198d207bf236",
+    "/chunks/dashboard~chunks/dashboard-oasis.js": "/chunks/dashboard~chunks/dashboard-oasis.js?id=67a4a8d617c2e38cb1f3",
     "/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=2e029bf012cccfd18e6c",
     "/chunks/database.js": "/chunks/database.js?id=9bc302dbe41bf670f8a9",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=17cbd34e8c621c7a93e5",
@@ -48,18 +48,18 @@
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=877a9289b77ac3885042",
     "/chunks/homepage.js": "/chunks/homepage.js?id=1a86b7f0efa95ad65c4a",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a7161403b0b11e4cca31",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=1deb187f6d3eb1e81ad0",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=733a4a9b02203923e96b",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e",
     "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a1885dd8814f9eb63a1c",
-    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=416333fce97bf3a118a2",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=73d1d3e360d271600cb5",
     "/chunks/oasis/invoices/client.js": "/chunks/oasis/invoices/client.js?id=63a83703890e6cf422f4",
     "/chunks/oasis/invoices/client-detail.js": "/chunks/oasis/invoices/client-detail.js?id=2414e131ef16f6f2a27a",
-    "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=988b280cc50ad75eec8c",
+    "/chunks/oasis/invoices/client-invoices.js": "/chunks/oasis/invoices/client-invoices.js?id=ccf5c9160393a47ffae1",
     "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=1074eed0dd32164a0459",
     "/chunks/oasis/invoices/create-invoice.js": "/chunks/oasis/invoices/create-invoice.js?id=d9deb3eb0c78b7cb9a12",
     "/chunks/oasis/invoices/edit-invoice.js": "/chunks/oasis/invoices/edit-invoice.js?id=f46025ebb44bb463b0e4",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=c8c730eb1e4d088d257d",
-    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=ea95035cbe1e905f0e95",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=6ae008cd536881c544b1",
+    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=f5e6fe3ce017639e0bfd",
     "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=865f72ddd4457b2f06a7",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=74bc76fa643e04156e64",
     "/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=0c8d1c3cca084baa177f",
@@ -69,13 +69,13 @@
     "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=3049cab9b83dbaa2e845",
     "/chunks/oasis/users.js": "/chunks/oasis/users.js?id=d15e1dd3ad4aa6cd8a77",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=b6ee867306c92694b2d9",
-    "/chunks/pages.js": "/chunks/pages.js?id=92fb357054e594b5495f",
+    "/chunks/pages.js": "/chunks/pages.js?id=7a1843e7aaeeaa111dc8",
     "/chunks/plan.js": "/chunks/plan.js?id=ac3046761e9083aa3053",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=9c60eecce15ff6d1dcc8",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=c4ccb97c4b4d2c122590",
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=efcfb6b56d3d731cd249",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=2af5147fa5009bbac6c7",
-    "/chunks/plans.js": "/chunks/plans.js?id=5e1c668e35d2f04973b7",
+    "/chunks/plans.js": "/chunks/plans.js?id=d4cfc1b66dd5021a3c84",
     "/chunks/platform.js": "/chunks/platform.js?id=3f5ca2052151763b2b16",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=7f182e48a682fc97d035",
     "/chunks/profile.js": "/chunks/profile.js?id=4c9676e2bb9df6ebe9f3",
@@ -104,7 +104,7 @@
     "/chunks/user-create.js": "/chunks/user-create.js?id=81dff41031024cb2557e",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=86c3cd2f4ad83f3b9493",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=6404200076f9cb76d0a6",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=0285b30ad626b5ae9488",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=813b4725ffcffef673de",
     "/chunks/user-password.js": "/chunks/user-password.js?id=acc83fd68682e7b8f1b0",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=eca49ccfadab81f08cf3",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=32b823b73166fcaf70c4",
@@ -202,5 +202,114 @@
     "/chunks/oasis/invoices/create-invoice.f955b3c368ef5e10b02e.hot-update.js": "/chunks/oasis/invoices/create-invoice.f955b3c368ef5e10b02e.hot-update.js",
     "/chunks/oasis/invoices/create-invoice.b87e7cc19deb5d8134ac.hot-update.js": "/chunks/oasis/invoices/create-invoice.b87e7cc19deb5d8134ac.hot-update.js",
     "/chunks/oasis/invoices/create-invoice.c3185882e157a1203d4c.hot-update.js": "/chunks/oasis/invoices/create-invoice.c3185882e157a1203d4c.hot-update.js",
-    "/chunks/oasis/invoices/create-invoice.fce45048a1e1b00ef163.hot-update.js": "/chunks/oasis/invoices/create-invoice.fce45048a1e1b00ef163.hot-update.js"
+    "/chunks/oasis/invoices/create-invoice.fce45048a1e1b00ef163.hot-update.js": "/chunks/oasis/invoices/create-invoice.fce45048a1e1b00ef163.hot-update.js",
+    "/chunks/oasis/invoices/profile.7b4e2eb09a7e1d1c7a86.hot-update.js": "/chunks/oasis/invoices/profile.7b4e2eb09a7e1d1c7a86.hot-update.js",
+    "/chunks/oasis/invoices/profile.8f2b3ea340152ed10407.hot-update.js": "/chunks/oasis/invoices/profile.8f2b3ea340152ed10407.hot-update.js",
+    "/chunks/oasis/invoices/profile.a4401fcd8d0cab3a61de.hot-update.js": "/chunks/oasis/invoices/profile.a4401fcd8d0cab3a61de.hot-update.js",
+    "/chunks/oasis/invoices/profile.7ec8b3dc8ec616ae8432.hot-update.js": "/chunks/oasis/invoices/profile.7ec8b3dc8ec616ae8432.hot-update.js",
+    "/chunks/oasis/invoices/profile.49426fdaf898284be9c2.hot-update.js": "/chunks/oasis/invoices/profile.49426fdaf898284be9c2.hot-update.js",
+    "/chunks/oasis/invoices/profile.49b6146eea561183bf6c.hot-update.js": "/chunks/oasis/invoices/profile.49b6146eea561183bf6c.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.9c012ddbb007b59a2484.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/invoices.9c012ddbb007b59a2484.hot-update.js": "/chunks/invoices.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/oasis/invoices/client-invoices.9c012ddbb007b59a2484.hot-update.js": "/chunks/oasis/invoices/client-invoices.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/oasis/invoices/profile.9c012ddbb007b59a2484.hot-update.js": "/chunks/oasis/invoices/profile.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/pages.9c012ddbb007b59a2484.hot-update.js": "/chunks/pages.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/plans.9c012ddbb007b59a2484.hot-update.js": "/chunks/plans.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/user-invoices.9c012ddbb007b59a2484.hot-update.js": "/chunks/user-invoices.9c012ddbb007b59a2484.hot-update.js",
+    "/chunks/oasis/invoices/profile.587fbdc2aea51d7d3e31.hot-update.js": "/chunks/oasis/invoices/profile.587fbdc2aea51d7d3e31.hot-update.js",
+    "/chunks/oasis/invoices/profile.19640dd8f223226fbe6e.hot-update.js": "/chunks/oasis/invoices/profile.19640dd8f223226fbe6e.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.9e52264e5f7b725e356c.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/invoices.9e52264e5f7b725e356c.hot-update.js": "/chunks/invoices.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/oasis/invoices/client-invoices.9e52264e5f7b725e356c.hot-update.js": "/chunks/oasis/invoices/client-invoices.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/oasis/invoices/profile.9e52264e5f7b725e356c.hot-update.js": "/chunks/oasis/invoices/profile.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/pages.9e52264e5f7b725e356c.hot-update.js": "/chunks/pages.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/plans.9e52264e5f7b725e356c.hot-update.js": "/chunks/plans.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/user-invoices.9e52264e5f7b725e356c.hot-update.js": "/chunks/user-invoices.9e52264e5f7b725e356c.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.1e7faf1470c2bc7db836.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/invoices.1e7faf1470c2bc7db836.hot-update.js": "/chunks/invoices.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/oasis/invoices/client-invoices.1e7faf1470c2bc7db836.hot-update.js": "/chunks/oasis/invoices/client-invoices.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/oasis/invoices/profile.1e7faf1470c2bc7db836.hot-update.js": "/chunks/oasis/invoices/profile.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/pages.1e7faf1470c2bc7db836.hot-update.js": "/chunks/pages.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/plans.1e7faf1470c2bc7db836.hot-update.js": "/chunks/plans.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/user-invoices.1e7faf1470c2bc7db836.hot-update.js": "/chunks/user-invoices.1e7faf1470c2bc7db836.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.7390af0a50d7d48f339d.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/invoices.7390af0a50d7d48f339d.hot-update.js": "/chunks/invoices.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/oasis/invoices/client-invoices.7390af0a50d7d48f339d.hot-update.js": "/chunks/oasis/invoices/client-invoices.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/oasis/invoices/profile.7390af0a50d7d48f339d.hot-update.js": "/chunks/oasis/invoices/profile.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/pages.7390af0a50d7d48f339d.hot-update.js": "/chunks/pages.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/plans.7390af0a50d7d48f339d.hot-update.js": "/chunks/plans.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/user-invoices.7390af0a50d7d48f339d.hot-update.js": "/chunks/user-invoices.7390af0a50d7d48f339d.hot-update.js",
+    "/chunks/oasis/invoices/profile.a8da95a0f6161990bb7c.hot-update.js": "/chunks/oasis/invoices/profile.a8da95a0f6161990bb7c.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/invoices.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/invoices.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/oasis/invoices/client-invoices.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/oasis/invoices/client-invoices.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/oasis/invoices/profile.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/oasis/invoices/profile.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/pages.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/pages.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/plans.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/plans.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/user-invoices.6a7a27a2f22c54f9022f.hot-update.js": "/chunks/user-invoices.6a7a27a2f22c54f9022f.hot-update.js",
+    "/chunks/oasis/invoices.876ee177ec9266d05012.hot-update.js": "/chunks/oasis/invoices.876ee177ec9266d05012.hot-update.js",
+    "/chunks/oasis/invoices.ef4be04d8d1e51770a02.hot-update.js": "/chunks/oasis/invoices.ef4be04d8d1e51770a02.hot-update.js",
+    "/chunks/oasis/invoices/list.9ae2394a14af2dd7a81f.hot-update.js": "/chunks/oasis/invoices/list.9ae2394a14af2dd7a81f.hot-update.js",
+    "/chunks/oasis/invoices.34e9637a36852035965a.hot-update.js": "/chunks/oasis/invoices.34e9637a36852035965a.hot-update.js",
+    "/chunks/oasis/invoices/list.87c70b2682d2521f3320.hot-update.js": "/chunks/oasis/invoices/list.87c70b2682d2521f3320.hot-update.js",
+    "/chunks/oasis/invoices/list.ca048b52ab8347055f21.hot-update.js": "/chunks/oasis/invoices/list.ca048b52ab8347055f21.hot-update.js",
+    "/chunks/oasis/invoices/list.cfa8bbd0d7c7f25596ee.hot-update.js": "/chunks/oasis/invoices/list.cfa8bbd0d7c7f25596ee.hot-update.js",
+    "/chunks/oasis/invoices/list.e7342535fb52068d1839.hot-update.js": "/chunks/oasis/invoices/list.e7342535fb52068d1839.hot-update.js",
+    "/chunks/oasis/invoices.858f59b6b628dc7a1b8b.hot-update.js": "/chunks/oasis/invoices.858f59b6b628dc7a1b8b.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.9fd5b5a1dfce25c44aa8.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.9fd5b5a1dfce25c44aa8.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.0f8ef4f46bb06934d372.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.0f8ef4f46bb06934d372.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.66fce2bf92edbd823f05.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.66fce2bf92edbd823f05.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.906190d2055d94bb4650.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.906190d2055d94bb4650.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.8015cb9cba74a6fda751.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.8015cb9cba74a6fda751.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.30c5838a3f7d2d46ea96.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.30c5838a3f7d2d46ea96.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.d2e15c5eb6a6e7a1d64f.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.d2e15c5eb6a6e7a1d64f.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.6d7f9790a467dbc88510.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.6d7f9790a467dbc88510.hot-update.js",
+    "/chunks/oasis/invoices/list.abc045c4c76cb2c5f996.hot-update.js": "/chunks/oasis/invoices/list.abc045c4c76cb2c5f996.hot-update.js",
+    "/chunks/oasis/invoices.943b5fae818faca09dd4.hot-update.js": "/chunks/oasis/invoices.943b5fae818faca09dd4.hot-update.js",
+    "/chunks/oasis/invoices/profile.bd7771e06e77bb0bf112.hot-update.js": "/chunks/oasis/invoices/profile.bd7771e06e77bb0bf112.hot-update.js",
+    "/chunks/oasis/invoices/profile.a861f0c0e49d05712a31.hot-update.js": "/chunks/oasis/invoices/profile.a861f0c0e49d05712a31.hot-update.js",
+    "/chunks/oasis/invoices/profile.007f1021a3cd4998913c.hot-update.js": "/chunks/oasis/invoices/profile.007f1021a3cd4998913c.hot-update.js",
+    "/chunks/oasis/invoices/profile.338c01656824f0d0e4f5.hot-update.js": "/chunks/oasis/invoices/profile.338c01656824f0d0e4f5.hot-update.js",
+    "/chunks/oasis/invoices/profile.0eef57513d1f6523048a.hot-update.js": "/chunks/oasis/invoices/profile.0eef57513d1f6523048a.hot-update.js",
+    "/chunks/oasis/invoices/profile.b356d50ed2447b62f236.hot-update.js": "/chunks/oasis/invoices/profile.b356d50ed2447b62f236.hot-update.js",
+    "/js/main.50b2426dc6c75ea256e0.hot-update.js": "/js/main.50b2426dc6c75ea256e0.hot-update.js",
+    "/chunks/admin~chunks/oasis/invoices~chunks/platform.50b2426dc6c75ea256e0.hot-update.js": "/chunks/admin~chunks/oasis/invoices~chunks/platform.50b2426dc6c75ea256e0.hot-update.js",
+    "/chunks/oasis/invoices.50b2426dc6c75ea256e0.hot-update.js": "/chunks/oasis/invoices.50b2426dc6c75ea256e0.hot-update.js",
+    "/chunks/oasis/invoices/profile.50b2426dc6c75ea256e0.hot-update.js": "/chunks/oasis/invoices/profile.50b2426dc6c75ea256e0.hot-update.js",
+    "/chunks/oasis/invoices/profile.b49575aafd75fe518435.hot-update.js": "/chunks/oasis/invoices/profile.b49575aafd75fe518435.hot-update.js",
+    "/chunks/oasis/invoices/profile.b3799c150d900e5cc19f.hot-update.js": "/chunks/oasis/invoices/profile.b3799c150d900e5cc19f.hot-update.js",
+    "/chunks/oasis/invoices/profile.0c3638e318c9e405cb81.hot-update.js": "/chunks/oasis/invoices/profile.0c3638e318c9e405cb81.hot-update.js",
+    "/chunks/oasis/invoices/profile.08244c593dd7d91fe7e0.hot-update.js": "/chunks/oasis/invoices/profile.08244c593dd7d91fe7e0.hot-update.js",
+    "/chunks/oasis/invoices/profile.bc1abde1582426c749e9.hot-update.js": "/chunks/oasis/invoices/profile.bc1abde1582426c749e9.hot-update.js",
+    "/chunks/oasis/invoices/profile.a238a521c697dd727639.hot-update.js": "/chunks/oasis/invoices/profile.a238a521c697dd727639.hot-update.js",
+    "/chunks/oasis/invoices/profile.446b243e77985846b884.hot-update.js": "/chunks/oasis/invoices/profile.446b243e77985846b884.hot-update.js",
+    "/chunks/oasis/invoices/profile.2572d10116ab9bf6aab3.hot-update.js": "/chunks/oasis/invoices/profile.2572d10116ab9bf6aab3.hot-update.js",
+    "/chunks/oasis/invoices/profile.88494b5d73d9114d6c0e.hot-update.js": "/chunks/oasis/invoices/profile.88494b5d73d9114d6c0e.hot-update.js",
+    "/chunks/oasis/invoices/profile.7c48ba71324804eb7251.hot-update.js": "/chunks/oasis/invoices/profile.7c48ba71324804eb7251.hot-update.js",
+    "/chunks/oasis/invoices/profile.3ee8a206069b40743915.hot-update.js": "/chunks/oasis/invoices/profile.3ee8a206069b40743915.hot-update.js",
+    "/chunks/oasis/invoices/profile.49504ccbdc3545756d29.hot-update.js": "/chunks/oasis/invoices/profile.49504ccbdc3545756d29.hot-update.js",
+    "/chunks/oasis/invoices/profile.2009bfce7482eaf7f61c.hot-update.js": "/chunks/oasis/invoices/profile.2009bfce7482eaf7f61c.hot-update.js",
+    "/chunks/oasis/invoices/profile.81a5f064983651f75e60.hot-update.js": "/chunks/oasis/invoices/profile.81a5f064983651f75e60.hot-update.js",
+    "/chunks/oasis/invoices/profile.adf6d3a116cac3afcf3b.hot-update.js": "/chunks/oasis/invoices/profile.adf6d3a116cac3afcf3b.hot-update.js",
+    "/chunks/oasis/invoices/profile.1601836d1585541f02d1.hot-update.js": "/chunks/oasis/invoices/profile.1601836d1585541f02d1.hot-update.js",
+    "/chunks/oasis/invoices/profile.cd985ba56bbcc3734f94.hot-update.js": "/chunks/oasis/invoices/profile.cd985ba56bbcc3734f94.hot-update.js",
+    "/chunks/oasis/invoices/profile.cfa1f2a4956c0fbfa80d.hot-update.js": "/chunks/oasis/invoices/profile.cfa1f2a4956c0fbfa80d.hot-update.js",
+    "/chunks/oasis/invoices/profile.5883ec031820eb732eab.hot-update.js": "/chunks/oasis/invoices/profile.5883ec031820eb732eab.hot-update.js",
+    "/chunks/oasis/invoices/profile.2f9b0a5f92dcb87be84f.hot-update.js": "/chunks/oasis/invoices/profile.2f9b0a5f92dcb87be84f.hot-update.js",
+    "/chunks/oasis/invoices/profile.9e506f4d322679f289ef.hot-update.js": "/chunks/oasis/invoices/profile.9e506f4d322679f289ef.hot-update.js",
+    "/chunks/oasis/invoices/profile.df8761275e69e305e95a.hot-update.js": "/chunks/oasis/invoices/profile.df8761275e69e305e95a.hot-update.js",
+    "/chunks/oasis/invoices/list.644baaa5ebb70505b104.hot-update.js": "/chunks/oasis/invoices/list.644baaa5ebb70505b104.hot-update.js",
+    "/chunks/oasis/invoices/list.d7f3fee440c4c019d235.hot-update.js": "/chunks/oasis/invoices/list.d7f3fee440c4c019d235.hot-update.js",
+    "/chunks/oasis/invoices/list.89a76692335eeec8ea5f.hot-update.js": "/chunks/oasis/invoices/list.89a76692335eeec8ea5f.hot-update.js",
+    "/chunks/oasis/invoices/list.7d085e0a66f4309bc82a.hot-update.js": "/chunks/oasis/invoices/list.7d085e0a66f4309bc82a.hot-update.js",
+    "/chunks/oasis/invoices/list.5f3f40c60610c9d4c83c.hot-update.js": "/chunks/oasis/invoices/list.5f3f40c60610c9d4c83c.hot-update.js",
+    "/chunks/oasis/invoices/list.22c08a917f64f927231f.hot-update.js": "/chunks/oasis/invoices/list.22c08a917f64f927231f.hot-update.js",
+    "/chunks/oasis/invoices/list.3fdc621b760f1efa317d.hot-update.js": "/chunks/oasis/invoices/list.3fdc621b760f1efa317d.hot-update.js",
+    "/chunks/oasis/invoices/list.ca9be51ef6d4eb4c9bf0.hot-update.js": "/chunks/oasis/invoices/list.ca9be51ef6d4eb4c9bf0.hot-update.js",
+    "/chunks/oasis/invoices/list.092c9b166c72863f5e4d.hot-update.js": "/chunks/oasis/invoices/list.092c9b166c72863f5e4d.hot-update.js",
+    "/chunks/oasis/invoices/list.89eef0253968ce10d28d.hot-update.js": "/chunks/oasis/invoices/list.89eef0253968ce10d28d.hot-update.js",
+    "/chunks/oasis/invoices/list.cd2111e8b73790b11e8e.hot-update.js": "/chunks/oasis/invoices/list.cd2111e8b73790b11e8e.hot-update.js",
+    "/chunks/oasis/invoices/profile.1811f3e46e365402e0d9.hot-update.js": "/chunks/oasis/invoices/profile.1811f3e46e365402e0d9.hot-update.js",
+    "/chunks/oasis/invoices/list.5d6d81552adff4b103b3.hot-update.js": "/chunks/oasis/invoices/list.5d6d81552adff4b103b3.hot-update.js",
+    "/chunks/oasis/invoices/profile.4b864a0c460887fd7c31.hot-update.js": "/chunks/oasis/invoices/profile.4b864a0c460887fd7c31.hot-update.js"
 }
diff --git a/resources/js/Oasis/Invoices/BillingProfile.vue b/resources/js/Oasis/Invoices/BillingProfile.vue
index e4bc3e45..75c9667a 100644
--- a/resources/js/Oasis/Invoices/BillingProfile.vue
+++ b/resources/js/Oasis/Invoices/BillingProfile.vue
@@ -3,9 +3,9 @@
 		<MobileHeader :title="$router.currentRoute.meta.title" />
 		<PageHeader :title="$router.currentRoute.meta.title" />
 
-		<div id="page-content" class="medium-width">
+		<div v-if="!isLoading && !profileNotExist" id="page-content" class="medium-width">
 			<div class="content-page">
-				<PageTab :is-loading="! profile">
+				<PageTab>
 					 <PageTabGroup>
 						<div class="form block-form">
 							<FormLabel>Company & Logo</FormLabel>
@@ -196,12 +196,26 @@
 				</PageTab>
 			</div>
 		</div>
+
+		<EmptyPageContent
+			v-if="!isLoading && profileNotExist"
+			icon="edit"
+			title="You don't have billing profile"
+			description="Before your first invoice, please set up your billing profile."
+		>
+            <router-link :to="{name: 'BillingProfileSetUp'}" tag="p">
+                <ButtonBase button-style="theme">
+					Set up Billing Profile
+				</ButtonBase>
+            </router-link>
+        </EmptyPageContent>
 	</div>
 
 </template>
 
 <script>
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import EmptyPageContent from '@/components/Others/EmptyPageContent'
 	import PageTabGroup from '@/components/Others/Layout/PageTabGroup'
 	import SelectInput from '@/components/Others/Forms/SelectInput'
 	import ImageInput from '@/components/Others/Forms/ImageInput'
@@ -223,6 +237,7 @@
 		components: {
 			ValidationProvider,
 			ValidationObserver,
+			EmptyPageContent,
 			PageTabGroup,
 			MobileHeader,
 			SelectInput,
@@ -243,8 +258,9 @@
 		},
 		data() {
 			return {
-				isLoading: false,
+				isLoading: true,
 				profile: undefined,
+				profileNotExist: false,
 			}
 		},
 		methods: {},
@@ -253,6 +269,14 @@
 				.then(response => {
 					this.profile = response.data.data.attributes
 				})
+				.catch(error => {
+					if (error.response.status === 404) {
+						this.profileNotExist = true
+					}
+				})
+				.finally(() => {
+					this.isLoading = false
+				})
 		}
 	}
 </script>
diff --git a/resources/js/Oasis/Invoices/BillingProfileSetUp.vue b/resources/js/Oasis/Invoices/BillingProfileSetUp.vue
new file mode 100644
index 00000000..545fb3ad
--- /dev/null
+++ b/resources/js/Oasis/Invoices/BillingProfileSetUp.vue
@@ -0,0 +1,313 @@
+<template>
+	<div id="single-page">
+		<MobileHeader :title="$router.currentRoute.meta.title" />
+		<PageHeader :can-back="true" :title="$router.currentRoute.meta.title" />
+		<div id="page-content" class="medium-width">
+			<ValidationObserver @submit.prevent="createBillingProfile" ref="createBillingProfile" v-slot="{ invalid }" tag="div" class="content-page form block-form">
+				<FormLabel>Company & Logo</FormLabel>
+				<InfoBox>
+					<p>Here you can set your <b class="text-theme">billing profile</b> which will be paste to your every newly generated invoice.</p>
+				</InfoBox>
+				<div class="block-wrapper">
+					<label>Logo (optional):</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="logo" v-slot="{ errors }">
+						<ImageInput :image="$getImage(profile.logo)" v-model="profile.logo" :error="errors[0]" />
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Company name:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="company" rules="required" v-slot="{ errors }">
+						<input v-model="profile.company" placeholder="Type your company name..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Registration Notes (optional):</label>
+					<div class="input-wrapper">
+						<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="registration_notes" v-slot="{ errors }">
+							<textarea
+								rows="2"
+								v-model="profile.registration_notes"
+								placeholder="Type your company registration notes..."
+								:class="{'is-error': errors[0]}"
+								class="focus-border-theme"
+							/>
+							<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+						</ValidationProvider>
+					</div>
+				</div>
+				<FormLabel class="mt-70">Company Details</FormLabel>
+				<div class="block-wrapper">
+					<label>ICO:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ico" rules="required" v-slot="{ errors }">
+						<input v-model="profile.ico" placeholder="Type your company ICO..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>DIC:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="dic" rules="required" v-slot="{ errors }">
+						<input v-model="profile.dic" placeholder="Type your company DIC..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>IC DPH (optional):</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ic_dph" v-slot="{ errors }">
+						<input v-model="profile.ic_dph" placeholder="Type your company IC DPH..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<FormLabel class="mt-70">Company Address</FormLabel>
+				<div class="block-wrapper">
+					<label>Address:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="address" rules="required" v-slot="{ errors }">
+						<input v-model="profile.address" placeholder="Type your company address..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="wrapper-inline">
+					<div class="block-wrapper">
+						<label>City:</label>
+						<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="city" rules="required" v-slot="{ errors }">
+							<input v-model="profile.city" placeholder="Type your company city..." type="text"
+								   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+							<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+						</ValidationProvider>
+					</div>
+					<div class="block-wrapper">
+						<label>Postal Code:</label>
+						<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="postal_code" rules="required" v-slot="{ errors }">
+							<input v-model="profile.postal_code" placeholder="Type your company postal code..." type="text"
+								   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+							<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+						</ValidationProvider>
+					</div>
+				</div>
+				<div class="block-wrapper">
+					<label>Country:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="country" rules="required" v-slot="{ errors }">
+						<SelectInput v-model="profile.country" :default="profile.country" :options="countries" placeholder="Select your company country" :isError="errors[0]" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<FormLabel class="mt-70">Bank Info</FormLabel>
+				<div class="block-wrapper">
+					<label>Bank Name:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="bank" rules="required" v-slot="{ errors }">
+						<input v-model="profile.bank" placeholder="Type your bank name..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>IBAN:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="iban" rules="required" v-slot="{ errors }">
+						<input v-model="profile.iban" placeholder="Type your IBAN..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Swift code:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="swift" rules="required" v-slot="{ errors }">
+						<input v-model="profile.swift" placeholder="Type your swift code..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<FormLabel class="mt-70">Author</FormLabel>
+				<div class="block-wrapper">
+					<label>Phone (optional):</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="phone" v-slot="{ errors }">
+						<input v-model="profile.phone" placeholder="Type your phone number..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Email (optional):</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="email" v-slot="{ errors }">
+						<input v-model="profile.email" placeholder="Type your email..." type="email"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Author name:</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="author" rules="required" v-slot="{ errors }">
+						<input v-model="profile.author" placeholder="Type the author invoice name..." type="text"
+							   :class="{'is-error': errors[0]}" class="focus-border-theme" />
+						<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+					</ValidationProvider>
+				</div>
+				<div class="block-wrapper">
+					<label>Stamp (optional):</label>
+					<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="stamp" v-slot="{ errors }">
+						<ImageInput v-model="profile.stamp" :error="errors[0]" />
+					</ValidationProvider>
+				</div>
+				<InfoBox v-if="isError" type="error">
+					<p>We found some issues in your form. Please check it out and submit again</p>
+				</InfoBox>
+				<div class="block-wrapper">
+					<ButtonBase @click.native="createBillingProfile" :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit" style="margin-bottom: 35px">
+						Store My Billing Profile
+					</ButtonBase>
+				</div>
+			</ValidationObserver>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import EmptyPageContent from '@/components/Others/EmptyPageContent'
+	import PageTabGroup from '@/components/Others/Layout/PageTabGroup'
+	import SelectInput from '@/components/Others/Forms/SelectInput'
+	import ImageInput from '@/components/Others/Forms/ImageInput'
+	import FormLabel from '@/components/Others/Forms/FormLabel'
+	import MobileHeader from '@/components/Mobile/MobileHeader'
+	import ButtonBase from '@/components/FilesView/ButtonBase'
+	import PageTab from '@/components/Others/Layout/PageTab'
+	import PageHeader from '@/components/Others/PageHeader'
+	import ThemeLabel from '@/components/Others/ThemeLabel'
+	import InfoBox from '@/components/Others/Forms/InfoBox'
+	import {required} from 'vee-validate/dist/rules'
+	import {mapGetters} from 'vuex'
+	import {events} from "@/bus"
+	import axios from "axios"
+
+	export default {
+		name: 'BillingProfile',
+		props: [
+			'user'
+		],
+		components: {
+			ValidationProvider,
+			ValidationObserver,
+			EmptyPageContent,
+			PageTabGroup,
+			MobileHeader,
+			SelectInput,
+			ImageInput,
+			PageHeader,
+			ButtonBase,
+			ThemeLabel,
+			FormLabel,
+			required,
+			InfoBox,
+			PageTab,
+		},
+		computed: {
+			...mapGetters([
+				'countries',
+				'config',
+			]),
+		},
+		data() {
+			return {
+				isError: false,
+				isLoading: false,
+				profile: {
+					logo: undefined,
+					company: undefined,
+					registration_notes: undefined,
+					ico: undefined,
+					dic: undefined,
+					ic_dph: undefined,
+					address: undefined,
+					city: undefined,
+					postal_code: undefined,
+					country: undefined,
+					bank: undefined,
+					iban: undefined,
+					swift: undefined,
+					phone: undefined,
+					email: undefined,
+					author: undefined,
+					stamp: undefined,
+				},
+			}
+		},
+		methods: {
+			async createBillingProfile() {
+				const isValid = await this.$refs.createBillingProfile.validate();
+
+				if (!isValid) {
+					this.isError = true
+					this.errorMessage = this.$t('in_editor.error')
+					return
+				}
+
+				// Start loading
+				this.isLoading = true
+
+				// Create form
+				let formData = new FormData()
+
+				// Append data to form
+				Object.keys(this.profile).forEach(key => {
+
+					if (this.profile[key])
+						formData.append(key, this.profile[key])
+				})
+
+				// Send request to get user token
+				axios
+					.post('/api/oasis/invoices/profile', formData, {
+						headers: {
+							'Content-Type': 'multipart/form-data',
+						}
+					})
+					.then(response => {
+
+						events.$emit('toaster', {
+							type: 'success',
+							message: 'Your billing profile was successfully stored',
+						})
+
+						this.$store.dispatch('getAppData')
+						this.$router.push({name: 'BillingProfile'})
+					})
+					.catch(error => {
+						this.isError = true
+
+						if (error.response.status === 422) {
+
+							Object.keys(error.response.data.errors).forEach(key => {
+
+								let obj = {};
+								obj[key] = error.response.data.errors[key]
+
+								this.$refs.createBillingProfile.setErrors(obj);
+							})
+
+						} else {
+							events.$emit('alert:open', {
+								title: this.$t('popup_error.title'),
+								message: this.$t('popup_error.message'),
+							})
+						}
+					})
+					.finally(() => this.isLoading = false)
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+    @import '@assets/vuefilemanager/_variables';
+	@import '@assets/vuefilemanager/_mixins';
+	@import '@assets/vuefilemanager/_forms';
+
+	.block-form {
+		max-width: 100%;
+	}
+
+</style>
diff --git a/resources/js/Oasis/Invoices/Invoice.vue b/resources/js/Oasis/Invoices/Invoice.vue
index 97e18985..7d59ce8e 100644
--- a/resources/js/Oasis/Invoices/Invoice.vue
+++ b/resources/js/Oasis/Invoices/Invoice.vue
@@ -48,7 +48,7 @@
 					</a>
 				</ContentGroup>
 				<ContentGroup title="Settings" class="navigator menu-list-wrapper vertical">
-					<router-link :to="{name: 'InvoicesProfile'}" class="menu-list-item link">
+					<router-link :to="{name: 'BillingProfile'}" class="menu-list-item link">
 						<div class="icon text-theme">
 							<edit2-icon size="17" />
 						</div>
@@ -127,13 +127,23 @@
 			},
 		},
 		mounted() {
+
+			if (! this.currentFolder) {
+
+				this.$store.commit('STORE_CURRENT_FOLDER', {
+					name: 'Invoices',
+					id: undefined,
+					location: 'regular-invoice',
+				})
+
+				this.$store.dispatch('getRegularInvoices')
+			}
+
 			events.$on('mobile-menu:show', () => this.isScaledDown = true)
 
 			events.$on('fileItem:deselect', () => this.isScaledDown = false)
 			events.$on('mobile-menu:hide', () => this.isScaledDown = false)
 
-			this.$store.dispatch('getRegularInvoices')
-
 			events.$on('action:confirmed', data => {
 				if (data.operation === 'delete-invoice') {
 
diff --git a/resources/js/Oasis/Invoices/InvoicesView.vue b/resources/js/Oasis/Invoices/InvoicesView.vue
index 9b5e5904..72020aa4 100644
--- a/resources/js/Oasis/Invoices/InvoicesView.vue
+++ b/resources/js/Oasis/Invoices/InvoicesView.vue
@@ -24,6 +24,9 @@
 				events.$emit('contextMenu:show', event, item)
 			},
 		},
+		mounted() {
+
+		}
 	}
 </script>
 
diff --git a/resources/js/Oasis/Invoices/components/EmptyInvoicePage.vue b/resources/js/Oasis/Invoices/components/EmptyInvoicePage.vue
index 771e3837..2aa6ea15 100644
--- a/resources/js/Oasis/Invoices/components/EmptyInvoicePage.vue
+++ b/resources/js/Oasis/Invoices/components/EmptyInvoicePage.vue
@@ -2,8 +2,8 @@
     <div class="empty-page" v-if="isLoading || isEmpty">
         <div class="empty-state">
 
-			<!--Base invoice browser empty message-->
-            <div class="text-content" v-if="$isThisLocation(['regular-invoice', 'advance-invoice']) && !isLoading">
+			<!--Invoice message-->
+            <div class="text-content" v-if="hasBillingProfile && $isThisLocation(['regular-invoice', 'advance-invoice']) && !isLoading">
                 <h1 class="title">
 					Create Your First Invoice
 				</h1>
@@ -16,7 +16,9 @@
 					{{ buttonTitle }}
 				</ButtonBase>
             </div>
-            <div class="text-content" v-if="$isThisLocation('clients') && !isLoading">
+
+			<!--Client Message-->
+            <div class="text-content" v-if="hasBillingProfile && $isThisLocation('clients') && !isLoading">
                 <h1 class="title">
 					Create Your First Client
 				</h1>
@@ -30,6 +32,21 @@
 				</ButtonBase>
             </div>
 
+			<!--Billing Profile Message-->
+            <div class="text-content" v-if="! hasBillingProfile">
+                <h1 class="title">
+					You don't have billing profile
+				</h1>
+
+                <p class="description">
+					Before your first invoice, please set up your billing profile.
+				</p>
+
+                <ButtonBase @click.native="createBillingProfile" button-style="theme" class="button">
+					Set up Billing Profile
+				</ButtonBase>
+            </div>
+
 			<!--Spinner-->
             <div class="text-content" v-if="isLoading">
                 <Spinner />
@@ -58,12 +75,16 @@
 				'currentFolder',
 				'isLoading',
 				'entries',
+				'user',
 			]),
 			isEmpty() {
 				return this.entries && this.entries.length == 0
 			},
 			buttonTitle() {
 				return this.$isThisLocation('regular-invoice') ? 'Create Regular Invoice' : 'Create Advance Invoice'
+			},
+			hasBillingProfile() {
+				return this.user && this.user.data.attributes.has_billing_profile
 			}
 		},
 		methods: {
@@ -72,6 +93,9 @@
 			},
 			createClient() {
 				this.$router.push({name: 'CreateClient'})
+			},
+			createBillingProfile() {
+				this.$router.push({name: 'BillingProfileSetUp'})
 			}
 		}
 	}
diff --git a/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue b/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
index e5fdb862..e6fe6171 100644
--- a/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
+++ b/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
@@ -149,12 +149,6 @@
 			events.$on('fileItem:deselect', () => {
 				this.$store.commit('CLIPBOARD_CLEAR')
 			})
-
-			this.$store.commit('STORE_CURRENT_FOLDER', {
-				name: 'Invoices',
-				id: undefined,
-				location: 'regular-invoice',
-			})
 		}
 	}
 </script>
diff --git a/resources/js/components/Others/EmptyPageContent.vue b/resources/js/components/Others/EmptyPageContent.vue
index 3e3859be..18fe13a7 100644
--- a/resources/js/components/Others/EmptyPageContent.vue
+++ b/resources/js/components/Others/EmptyPageContent.vue
@@ -2,9 +2,10 @@
     <div class="empty-page-content">
         <div class="content">
             <div class="icon">
-                <file-icon v-if="icon === 'file'" size="38"></file-icon>
-                <file-text-icon v-if="icon === 'file-text'" size="38"></file-text-icon>
-                <settings-icon v-if="icon === 'settings'" size="38"></settings-icon>
+                <file-icon v-if="icon === 'file'" size="38" class="text-theme" />
+                <file-text-icon v-if="icon === 'file-text'" size="38" class="text-theme" />
+                <settings-icon v-if="icon === 'settings'" size="38" class="text-theme" />
+                <edit2-icon v-if="icon === 'edit'" size="38" class="text-theme" />
             </div>
             <div class="header">
                 <h1 class="title">{{ title }}</h1>
@@ -16,7 +17,7 @@
 </template>
 
 <script>
-    import { FileIcon, FileTextIcon, SettingsIcon } from 'vue-feather-icons'
+    import { FileIcon, FileTextIcon, SettingsIcon, Edit2Icon } from 'vue-feather-icons'
 
     export default {
         name: 'EmptyPageContent',
@@ -24,6 +25,7 @@
         components: {
             SettingsIcon,
             FileTextIcon,
+			Edit2Icon,
             FileIcon,
         }
     }
@@ -41,7 +43,7 @@
         text-align: center;
 
         .content {
-            margin: 0 auto;
+            margin: -70px auto 0;
             max-width: 360px;
 
             /deep/ .button-base {
@@ -51,7 +53,7 @@
 
         .icon {
             path, polyline, line, circle {
-                stroke: $theme;
+                color: inherit;
             }
         }
 
diff --git a/resources/js/components/Sidebar/SidebarNavigation.vue b/resources/js/components/Sidebar/SidebarNavigation.vue
index 5ca42ea1..6f83d17a 100644
--- a/resources/js/components/Sidebar/SidebarNavigation.vue
+++ b/resources/js/components/Sidebar/SidebarNavigation.vue
@@ -20,11 +20,11 @@
                 </div>
             </router-link>
 
-            <router-link :to="{name: 'InvoicesList'}" title="Invoices" :class="{'is-active': $isThisRoute($route, invoiceRoutes)}" class="icon-navigation-item shared">
+            <a @click="goToInvoice" title="Invoices" :class="{'is-active': $isThisRoute($route, invoiceRoutes)}" class="icon-navigation-item shared">
                 <div class="button-icon">
                     <file-text-icon size="19" />
                 </div>
-            </router-link>
+            </a>
 
             <router-link :to="{name: 'Profile'}" :class="{'is-active': isUserProfileRoute}" :title="$t('locations.profile')" class="icon-navigation-item settings">
                 <div class="button-icon">
@@ -87,7 +87,7 @@
             return {
 				invoiceRoutes: [
 					'InvoicesList',
-					'InvoicesProfile',
+					'BillingProfile',
 					'CreateClient',
 					'CreateInvoice',
 					'ClientDetail',
@@ -125,6 +125,19 @@
                 ]
             }
         },
+		methods: {
+			goToInvoice() {
+				this.$router.push({name: 'InvoicesList'})
+
+				this.$store.commit('STORE_CURRENT_FOLDER', {
+					name: 'Invoices',
+					id: undefined,
+					location: 'regular-invoice',
+				})
+
+				this.$store.dispatch('getRegularInvoices')
+			}
+		},
         mounted() {
             this.$store.dispatch('getAppData')
         }
diff --git a/resources/js/router.js b/resources/js/router.js
index 4783479b..7fbaaea5 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -93,7 +93,7 @@ const routesOasis = [
                 },
             },
             {
-                name: 'InvoicesProfile',
+                name: 'BillingProfile',
                 path: '/invoice/profile',
                 component: () =>
                     import(/* webpackChunkName: "chunks/oasis/invoices/profile" */ './Oasis/Invoices/BillingProfile'),
@@ -102,6 +102,16 @@ const routesOasis = [
                     title: 'My Billing Profile'
                 },
             },
+            {
+                name: 'BillingProfileSetUp',
+                path: '/invoice/set-up-billing-profile',
+                component: () =>
+                    import(/* webpackChunkName: "chunks/oasis/invoices/profile" */ './Oasis/Invoices/BillingProfileSetUp'),
+                meta: {
+                    requiresAuth: true,
+                    title: 'Set My Billing Profile'
+                },
+            },
             {
                 name: 'CreateClient',
                 path: '/invoice/create-client',