diff --git a/app/Http/Requests/Oasis/StoreClientRequest.php b/app/Http/Requests/Oasis/StoreClientRequest.php
index aa61d5fd..9adb08e6 100644
--- a/app/Http/Requests/Oasis/StoreClientRequest.php
+++ b/app/Http/Requests/Oasis/StoreClientRequest.php
@@ -24,7 +24,7 @@ class StoreClientRequest extends FormRequest
     public function rules()
     {
         return [
-            'avatar'       => 'sometimes|file|nullable',
+            'avatar'       => 'sometimes|nullable',
             'name'         => 'required|string',
             'email'        => 'sometimes|email|nullable',
             'phone_number' => 'sometimes|string|nullable',
@@ -33,8 +33,8 @@ class StoreClientRequest extends FormRequest
             'postal_code'  => 'required|string',
             'country'      => 'required|string',
             'ico'          => 'required|string',
-            'dic'          => 'required|string',
-            'ic_dph'       => 'required|string',
+            'dic'          => 'required|string|nullable',
+            'ic_dph'       => 'sometimes|string|nullable',
         ];
     }
 }
diff --git a/app/Http/Resources/Oasis/OasisClientResource.php b/app/Http/Resources/Oasis/OasisClientResource.php
index 65f1dea1..5a477751 100644
--- a/app/Http/Resources/Oasis/OasisClientResource.php
+++ b/app/Http/Resources/Oasis/OasisClientResource.php
@@ -26,7 +26,7 @@ class OasisClientResource extends JsonResource
             'id'            => $this->id,
             'name'          => $this->name,
             'email'         => $this->email,
-            'avatar'        => url('/assets/images/default-avatar.png'),
+            'avatar'        => $this->avatar,
             'totalNet'      => format_to_currency($total_net, 'CZK'),
             'totalInvoices' => $total_invoices,
             'type'          => 'client',
diff --git a/app/Traits/Oasis.php b/app/Traits/Oasis.php
index 9883746e..3218ee44 100644
--- a/app/Traits/Oasis.php
+++ b/app/Traits/Oasis.php
@@ -21,7 +21,8 @@ trait Oasis
 
     public function clients()
     {
-        return $this->hasMany(Client::class, 'user_id', 'id');
+        return $this->hasMany(Client::class, 'user_id', 'id')
+            ->orderByDesc('created_at');
     }
 
     public function regularInvoices()
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index cbeb4574..929cc617 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,7 +2,7 @@
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
     "/chunks/admin.js": "/chunks/admin.js?id=ca6495e1c589f24145e2",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=37099f3ee65bc2a4ecc6",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=6faf1e749ee8e85a4d10",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~21912951.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~21912951.js?id=c84c0a0b4cdd0f73d621",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~062c965c.js?id=515118382f7ad5724a54",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~129c344f.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~129c344f.js?id=4bbef035191de1ef475f",
@@ -13,7 +13,7 @@
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=5f29df56a2d5925c40c9",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b4e2d99a172f06a1d312",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=2feb3390febba02cc5f0",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=f9f637ff26a13d7beb5d",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=209e2117002b68ca4f3b",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=04f0cd9719723459b685",
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=82133cc16f55222bbbe6",
     "/chunks/app-email.js": "/chunks/app-email.js?id=c578a85112c6a4b1ed0e",
@@ -24,7 +24,7 @@
     "/chunks/app-others.js": "/chunks/app-others.js?id=9156adba3b1697a8bf3e",
     "/chunks/app-payments.js": "/chunks/app-payments.js?id=7e1a982c90174f568fb2",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=acc6ba7a93681f0d5d64",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=0170cfec241f69324b73",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=1299bde88a1c3582c1d8",
     "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=f896743bb3f276942d14",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=214c834b6427a82f40e7",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=22bd5db44c72e8de5f5b",
@@ -52,8 +52,8 @@
     "/chunks/invoices.js": "/chunks/invoices.js?id=1deb187f6d3eb1e81ad0",
     "/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=d43eb767e75676b3709f",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=a5ade7590b36f3793415",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=996b95c4cd43f0a6bcc1",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=e8efbb60888f89b1dcce",
     "/chunks/oasis/invoices~chunks/oasis/invoices/list.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list.js?id=045d3dd7ce573cb7ed11",
     "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/oasis/invoices/list~chunks/platform~chunks/shared.js?id=c69c0503d09d1588f14a",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e",
@@ -61,25 +61,25 @@
     "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=e53eeb48ebabae259f9c",
     "/chunks/oasis/upgrade-billing.js": "/chunks/oasis/upgrade-billing.js?id=b9cb16fc974049e52dea",
     "/chunks/oasis/upgrade-plan.js": "/chunks/oasis/upgrade-plan.js?id=178d0ff676d80a801283",
-    "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=3870c14d43c6839ef713",
+    "/chunks/oasis/user-create.js": "/chunks/oasis/user-create.js?id=a89b1e1f28c56db83e1c",
     "/chunks/oasis/users.js": "/chunks/oasis/users.js?id=d15e1dd3ad4aa6cd8a77",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=4c04e9f1bbecd8d1d9ba",
     "/chunks/pages.js": "/chunks/pages.js?id=92fb357054e594b5495f",
     "/chunks/plan.js": "/chunks/plan.js?id=ac3046761e9083aa3053",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=b966184a7aa84bdd297e",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=f193816778245ea66d02",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=66123f72696b47a986a2",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=141de35578976276cecf",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=83f21481a5fdfc2901eb",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e182f4b914566997837b",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=08e2056bc3744b2ea8f9",
     "/chunks/plans.js": "/chunks/plans.js?id=5e1c668e35d2f04973b7",
     "/chunks/platform.js": "/chunks/platform.js?id=f463eed74ce0e6852b6d",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=ec633fb6ff41c34084c8",
-    "/chunks/profile.js": "/chunks/profile.js?id=1c1c666004fb44b1c404",
+    "/chunks/profile.js": "/chunks/profile.js?id=246a48f7c4323e31f8ab",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=d0a44ee2cc3e9882c14a",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=a1e46acc22ce82b2a61b",
     "/chunks/settings.js": "/chunks/settings.js?id=fcc97a29894164e2977c",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=88849e6ddce9226d49a5",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=444b9bbc310647ddd297",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=46961d5c0fc91f4ad638",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=0b4940f63a3b1f101f2b",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3bc709a228c0849a6f62",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0c243c68b17ca976d05a",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=22e5c49d5b0a154e1a28",
@@ -97,12 +97,12 @@
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=cc5cee225c9b991e6639",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=35179531a8241da128e9",
     "/chunks/user.js": "/chunks/user.js?id=3090bfd5b85dd1b200ec",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=e1e6127d661c7edf0793",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=8dfec8efd3019616377b",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=b9b70e43cf551a574443",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=a5e92d00b10189a712ec",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=c3828c45d2367c5c75a4",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=a5ceeb9373890b4d63f9",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=6c4d0e9e058be11dc1f7",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=a4b4ab4f4af11533eb4d",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=4aec2d7b60ec0bc35fb9",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=fe2ea78be05401df11f5",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=645592521781ca72469f",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=99efdd410910267db66e",
     "/chunks/users.js": "/chunks/users.js?id=178dc8d8c83a43d6e77f",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5ccfc07.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5ccfc07.js?id=2b62263afbefba53c9c6",
@@ -115,7 +115,7 @@
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~d4164210.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~d4164210.js?id=e3ee9bacf6ea805729dc",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~d0bdaad8.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~d0bdaad8.js?id=20fd8e1ff0fbbb883a9e",
     "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~d23b1aac.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~d23b1aac.js?id=01ab356d3c9ba1175149",
-    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=ebd70d658c5b32c14826",
+    "/chunks/oasis/invoices/profile.js": "/chunks/oasis/invoices/profile.js?id=a2790bc4b13957a56133",
     "/chunks/oasis/invoices/profile~chunks/profile~chunks/settings-password.js": "/chunks/oasis/invoices/profile~chunks/profile~chunks/settings-password.js?id=5f7a7e52edee7c45c2fe",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~12116e2d.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~12116e2d.js?id=1f7ca53e6cba768de852",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~8cdffba1.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~8cdffba1.js?id=f35fc78322dc4eb27c4e",
@@ -132,7 +132,7 @@
     "/js/main.a8f461a7be41a863060e.hot-update.js": "/js/main.a8f461a7be41a863060e.hot-update.js",
     "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~be89c0bb.js": "/chunks/app-language~chunks/dashboard~chunks/dashboard-oasis~chunks/files~chunks/invoices~chunks/oasi~be89c0bb.js?id=b3e30c8dd757237db0e2",
     "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js": "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js?id=4030b241faac6b31341f",
-    "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=6808db2deb2d07287ce9",
+    "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=39233d603662ca3738e8",
     "/chunks/oasis/invoices.a8f461a7be41a863060e.hot-update.js": "/chunks/oasis/invoices.a8f461a7be41a863060e.hot-update.js",
     "/chunks/oasis/invoices/list.a8f461a7be41a863060e.hot-update.js": "/chunks/oasis/invoices/list.a8f461a7be41a863060e.hot-update.js",
     "/chunks/platform~chunks/shared.a8f461a7be41a863060e.hot-update.js": "/chunks/platform~chunks/shared.a8f461a7be41a863060e.hot-update.js",
@@ -199,5 +199,134 @@
     "/chunks/oasis/invoices/profile.19871652d7a72470542f.hot-update.js": "/chunks/oasis/invoices/profile.19871652d7a72470542f.hot-update.js",
     "/chunks/oasis/invoices/profile.cb81c09128a52a34d332.hot-update.js": "/chunks/oasis/invoices/profile.cb81c09128a52a34d332.hot-update.js",
     "/chunks/oasis/invoices/profile.5b768298ff09de647a58.hot-update.js": "/chunks/oasis/invoices/profile.5b768298ff09de647a58.hot-update.js",
-    "/chunks/oasis/invoices/profile.e846a41b96190f8daccf.hot-update.js": "/chunks/oasis/invoices/profile.e846a41b96190f8daccf.hot-update.js"
+    "/chunks/oasis/invoices/profile.e846a41b96190f8daccf.hot-update.js": "/chunks/oasis/invoices/profile.e846a41b96190f8daccf.hot-update.js",
+    "/js/main.2abb6c2a5bc962145aa0.hot-update.js": "/js/main.2abb6c2a5bc962145aa0.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~ch~d5261757.js": "/chunks/admin~chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~ch~d5261757.js?id=d21fb57bf57311960d1d",
+    "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js": "/chunks/files~chunks/oasis/invoices~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/f~5c41de43.js?id=83bc416ff063a1af88a4",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=e86986c3c77002af027e",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js?id=b4ccb4a816e5c72a0b85",
+    "/chunks/oasis/invoices.2abb6c2a5bc962145aa0.hot-update.js": "/chunks/oasis/invoices.2abb6c2a5bc962145aa0.hot-update.js",
+    "/chunks/oasis/invoices/list.2abb6c2a5bc962145aa0.hot-update.js": "/chunks/oasis/invoices/list.2abb6c2a5bc962145aa0.hot-update.js",
+    "/chunks/oasis/invoices/profile.2abb6c2a5bc962145aa0.hot-update.js": "/chunks/oasis/invoices/profile.2abb6c2a5bc962145aa0.hot-update.js",
+    "/chunks/oasis/invoices~chunks/platform~chunks/shared.2abb6c2a5bc962145aa0.hot-update.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.2abb6c2a5bc962145aa0.hot-update.js",
+    "/chunks/shared.2abb6c2a5bc962145aa0.hot-update.js": "/chunks/shared.2abb6c2a5bc962145aa0.hot-update.js",
+    "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=66afa0e341251a68c3d3",
+    "/js/main.92f7695426eb59207e5b.hot-update.js": "/js/main.92f7695426eb59207e5b.hot-update.js",
+    "/chunks/oasis/invoices/profile.92f7695426eb59207e5b.hot-update.js": "/chunks/oasis/invoices/profile.92f7695426eb59207e5b.hot-update.js",
+    "/js/main.bf6604988b4dbd83b226.hot-update.js": "/js/main.bf6604988b4dbd83b226.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.bf6604988b4dbd83b226.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.bf6604988b4dbd83b226.hot-update.js",
+    "/chunks/oasis/invoices.bf6604988b4dbd83b226.hot-update.js": "/chunks/oasis/invoices.bf6604988b4dbd83b226.hot-update.js",
+    "/chunks/oasis/invoices/list.bf6604988b4dbd83b226.hot-update.js": "/chunks/oasis/invoices/list.bf6604988b4dbd83b226.hot-update.js",
+    "/chunks/platform~chunks/shared.bf6604988b4dbd83b226.hot-update.js": "/chunks/platform~chunks/shared.bf6604988b4dbd83b226.hot-update.js",
+    "/chunks/oasis/invoices/list.837b6795d821e045d9b9.hot-update.js": "/chunks/oasis/invoices/list.837b6795d821e045d9b9.hot-update.js",
+    "/chunks/oasis/invoices/list.955894bd2a0bb875dd19.hot-update.js": "/chunks/oasis/invoices/list.955894bd2a0bb875dd19.hot-update.js",
+    "/js/main.56333ed0db26ca1f2dde.hot-update.js": "/js/main.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/admin-account.56333ed0db26ca1f2dde.hot-update.js": "/chunks/admin-account.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~5bfd6db3.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~5bfd6db3.js?id=19b20a4938f0bf4f98d6",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~a5040fe9.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~a5040fe9.js?id=13deb1daf20871fd71da",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~212dfde3.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~212dfde3.js?id=73a7cafebe77c9df5c17",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.56333ed0db26ca1f2dde.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~fab98574.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/dashboard-oasis~chunks/invoices~chun~fab98574.js?id=f019c9e6df2021c93987",
+    "/chunks/app-setup.56333ed0db26ca1f2dde.hot-update.js": "/chunks/app-setup.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/oasis/invoices/create-client.js": "/chunks/oasis/invoices/create-client.js?id=db5be54f7b11b4ad0b3f",
+    "/chunks/oasis/invoices/profile.56333ed0db26ca1f2dde.hot-update.js": "/chunks/oasis/invoices/profile.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/oasis/user-create.56333ed0db26ca1f2dde.hot-update.js": "/chunks/oasis/user-create.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/plan-create.56333ed0db26ca1f2dde.hot-update.js": "/chunks/plan-create.56333ed0db26ca1f2dde.hot-update.js",
+    "/chunks/user-create.56333ed0db26ca1f2dde.hot-update.js": "/chunks/user-create.56333ed0db26ca1f2dde.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~17e849e0.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~17e849e0.js?id=1db8071c5b166bf689fd",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~64ad4992.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~64ad4992.js?id=a204e136cfb6412bea54",
+    "/chunks/oasis/invoices/list.a64ed8fc2bf6d13e01d8.hot-update.js": "/chunks/oasis/invoices/list.a64ed8fc2bf6d13e01d8.hot-update.js",
+    "/chunks/oasis/invoices/create-client.cf663f9957c47b5a656c.hot-update.js": "/chunks/oasis/invoices/create-client.cf663f9957c47b5a656c.hot-update.js",
+    "/chunks/oasis/invoices/create-client.8f3df32744a6a68f5b8d.hot-update.js": "/chunks/oasis/invoices/create-client.8f3df32744a6a68f5b8d.hot-update.js",
+    "/chunks/oasis/invoices/create-client.8d6766a2a85868365e6e.hot-update.js": "/chunks/oasis/invoices/create-client.8d6766a2a85868365e6e.hot-update.js",
+    "/chunks/oasis/invoices/create-client.e06c40c99c51c3ddda1a.hot-update.js": "/chunks/oasis/invoices/create-client.e06c40c99c51c3ddda1a.hot-update.js",
+    "/chunks/oasis/invoices/create-client.a2f2ff8c3114fd53f019.hot-update.js": "/chunks/oasis/invoices/create-client.a2f2ff8c3114fd53f019.hot-update.js",
+    "/chunks/oasis/invoices/create-client.b22403c83da594921f77.hot-update.js": "/chunks/oasis/invoices/create-client.b22403c83da594921f77.hot-update.js",
+    "/chunks/oasis/invoices/create-client.38ad15ac6fbbd98c9b07.hot-update.js": "/chunks/oasis/invoices/create-client.38ad15ac6fbbd98c9b07.hot-update.js",
+    "/chunks/oasis/invoices/create-client.68b07dda9eb8fd63f8ce.hot-update.js": "/chunks/oasis/invoices/create-client.68b07dda9eb8fd63f8ce.hot-update.js",
+    "/chunks/oasis/invoices/create-client.cc8e8254ee6b223ce25f.hot-update.js": "/chunks/oasis/invoices/create-client.cc8e8254ee6b223ce25f.hot-update.js",
+    "/chunks/oasis/invoices/create-client.eeeeeeb5b85219234bc0.hot-update.js": "/chunks/oasis/invoices/create-client.eeeeeeb5b85219234bc0.hot-update.js",
+    "/chunks/oasis/invoices/create-client.a0e67acc61e731fa7b66.hot-update.js": "/chunks/oasis/invoices/create-client.a0e67acc61e731fa7b66.hot-update.js",
+    "/chunks/oasis/invoices/create-client.b6fda21c6194f2577273.hot-update.js": "/chunks/oasis/invoices/create-client.b6fda21c6194f2577273.hot-update.js",
+    "/chunks/oasis/invoices/create-client.15fbca994a466de136b8.hot-update.js": "/chunks/oasis/invoices/create-client.15fbca994a466de136b8.hot-update.js",
+    "/chunks/oasis/invoices/create-client.641a9dd9ce661dfb5f36.hot-update.js": "/chunks/oasis/invoices/create-client.641a9dd9ce661dfb5f36.hot-update.js",
+    "/chunks/oasis/invoices/create-client.19e4b4a3cf0c0f2a4a2f.hot-update.js": "/chunks/oasis/invoices/create-client.19e4b4a3cf0c0f2a4a2f.hot-update.js",
+    "/chunks/admin-account.24d8260894a8c3cc270b.hot-update.js": "/chunks/admin-account.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.24d8260894a8c3cc270b.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/app-language.24d8260894a8c3cc270b.hot-update.js": "/chunks/app-language.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/app-setup.24d8260894a8c3cc270b.hot-update.js": "/chunks/app-setup.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/billings-detail.24d8260894a8c3cc270b.hot-update.js": "/chunks/billings-detail.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/contact-us.24d8260894a8c3cc270b.hot-update.js": "/chunks/contact-us.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.24d8260894a8c3cc270b.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/database.24d8260894a8c3cc270b.hot-update.js": "/chunks/database.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/environment-setup.24d8260894a8c3cc270b.hot-update.js": "/chunks/environment-setup.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/installation-disclaimer.24d8260894a8c3cc270b.hot-update.js": "/chunks/installation-disclaimer.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/oasis/homepage.24d8260894a8c3cc270b.hot-update.js": "/chunks/oasis/homepage.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/oasis/invoices/create-client.24d8260894a8c3cc270b.hot-update.js": "/chunks/oasis/invoices/create-client.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/oasis/invoices/profile.24d8260894a8c3cc270b.hot-update.js": "/chunks/oasis/invoices/profile.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/oasis/platba.24d8260894a8c3cc270b.hot-update.js": "/chunks/oasis/platba.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/oasis/upgrade-billing.24d8260894a8c3cc270b.hot-update.js": "/chunks/oasis/upgrade-billing.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/plan-create.24d8260894a8c3cc270b.hot-update.js": "/chunks/plan-create.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/plan-subscribers.24d8260894a8c3cc270b.hot-update.js": "/chunks/plan-subscribers.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/platform.24d8260894a8c3cc270b.hot-update.js": "/chunks/platform.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/purchase-code.24d8260894a8c3cc270b.hot-update.js": "/chunks/purchase-code.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/settings.24d8260894a8c3cc270b.hot-update.js": "/chunks/settings.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/settings-create-payment-methods.24d8260894a8c3cc270b.hot-update.js": "/chunks/settings-create-payment-methods.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/settings-invoices.24d8260894a8c3cc270b.hot-update.js": "/chunks/settings-invoices.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/settings-payment-methods.24d8260894a8c3cc270b.hot-update.js": "/chunks/settings-payment-methods.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/settings-subscription.24d8260894a8c3cc270b.hot-update.js": "/chunks/settings-subscription.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/stripe-credentials.24d8260894a8c3cc270b.hot-update.js": "/chunks/stripe-credentials.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/subscription-plans.24d8260894a8c3cc270b.hot-update.js": "/chunks/subscription-plans.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/upgrade-billing.24d8260894a8c3cc270b.hot-update.js": "/chunks/upgrade-billing.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/user-invoices.24d8260894a8c3cc270b.hot-update.js": "/chunks/user-invoices.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/user-subscription.24d8260894a8c3cc270b.hot-update.js": "/chunks/user-subscription.24d8260894a8c3cc270b.hot-update.js",
+    "/chunks/admin-account.2676a9c66c5586639586.hot-update.js": "/chunks/admin-account.2676a9c66c5586639586.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.2676a9c66c5586639586.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.2676a9c66c5586639586.hot-update.js",
+    "/chunks/app-language.2676a9c66c5586639586.hot-update.js": "/chunks/app-language.2676a9c66c5586639586.hot-update.js",
+    "/chunks/app-setup.2676a9c66c5586639586.hot-update.js": "/chunks/app-setup.2676a9c66c5586639586.hot-update.js",
+    "/chunks/billings-detail.2676a9c66c5586639586.hot-update.js": "/chunks/billings-detail.2676a9c66c5586639586.hot-update.js",
+    "/chunks/contact-us.2676a9c66c5586639586.hot-update.js": "/chunks/contact-us.2676a9c66c5586639586.hot-update.js",
+    "/chunks/dashboard~chunks/dashboard-oasis.2676a9c66c5586639586.hot-update.js": "/chunks/dashboard~chunks/dashboard-oasis.2676a9c66c5586639586.hot-update.js",
+    "/chunks/database.2676a9c66c5586639586.hot-update.js": "/chunks/database.2676a9c66c5586639586.hot-update.js",
+    "/chunks/environment-setup.2676a9c66c5586639586.hot-update.js": "/chunks/environment-setup.2676a9c66c5586639586.hot-update.js",
+    "/chunks/installation-disclaimer.2676a9c66c5586639586.hot-update.js": "/chunks/installation-disclaimer.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/homepage.2676a9c66c5586639586.hot-update.js": "/chunks/oasis/homepage.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/invoices/create-client.2676a9c66c5586639586.hot-update.js": "/chunks/oasis/invoices/create-client.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/invoices/profile.2676a9c66c5586639586.hot-update.js": "/chunks/oasis/invoices/profile.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/platba.2676a9c66c5586639586.hot-update.js": "/chunks/oasis/platba.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/upgrade-billing.2676a9c66c5586639586.hot-update.js": "/chunks/oasis/upgrade-billing.2676a9c66c5586639586.hot-update.js",
+    "/chunks/plan-create.2676a9c66c5586639586.hot-update.js": "/chunks/plan-create.2676a9c66c5586639586.hot-update.js",
+    "/chunks/plan-subscribers.2676a9c66c5586639586.hot-update.js": "/chunks/plan-subscribers.2676a9c66c5586639586.hot-update.js",
+    "/chunks/platform.2676a9c66c5586639586.hot-update.js": "/chunks/platform.2676a9c66c5586639586.hot-update.js",
+    "/chunks/purchase-code.2676a9c66c5586639586.hot-update.js": "/chunks/purchase-code.2676a9c66c5586639586.hot-update.js",
+    "/chunks/settings.2676a9c66c5586639586.hot-update.js": "/chunks/settings.2676a9c66c5586639586.hot-update.js",
+    "/chunks/settings-create-payment-methods.2676a9c66c5586639586.hot-update.js": "/chunks/settings-create-payment-methods.2676a9c66c5586639586.hot-update.js",
+    "/chunks/settings-invoices.2676a9c66c5586639586.hot-update.js": "/chunks/settings-invoices.2676a9c66c5586639586.hot-update.js",
+    "/chunks/settings-payment-methods.2676a9c66c5586639586.hot-update.js": "/chunks/settings-payment-methods.2676a9c66c5586639586.hot-update.js",
+    "/chunks/settings-subscription.2676a9c66c5586639586.hot-update.js": "/chunks/settings-subscription.2676a9c66c5586639586.hot-update.js",
+    "/chunks/stripe-credentials.2676a9c66c5586639586.hot-update.js": "/chunks/stripe-credentials.2676a9c66c5586639586.hot-update.js",
+    "/chunks/subscription-plans.2676a9c66c5586639586.hot-update.js": "/chunks/subscription-plans.2676a9c66c5586639586.hot-update.js",
+    "/chunks/upgrade-billing.2676a9c66c5586639586.hot-update.js": "/chunks/upgrade-billing.2676a9c66c5586639586.hot-update.js",
+    "/chunks/user-invoices.2676a9c66c5586639586.hot-update.js": "/chunks/user-invoices.2676a9c66c5586639586.hot-update.js",
+    "/chunks/user-subscription.2676a9c66c5586639586.hot-update.js": "/chunks/user-subscription.2676a9c66c5586639586.hot-update.js",
+    "/chunks/oasis/invoices/create-client.d69bcf62e36ff51a11a1.hot-update.js": "/chunks/oasis/invoices/create-client.d69bcf62e36ff51a11a1.hot-update.js",
+    "/chunks/oasis/invoices/profile.8cf9157aee10afdd74a1.hot-update.js": "/chunks/oasis/invoices/profile.8cf9157aee10afdd74a1.hot-update.js",
+    "/chunks/oasis/invoices/create-client.fb9ba236ed5c852fd73b.hot-update.js": "/chunks/oasis/invoices/create-client.fb9ba236ed5c852fd73b.hot-update.js",
+    "/chunks/oasis/invoices/create-client.d1ef5eb1914102fda52e.hot-update.js": "/chunks/oasis/invoices/create-client.d1ef5eb1914102fda52e.hot-update.js",
+    "/chunks/oasis/invoices/create-client.64d30e96bc5206ab9937.hot-update.js": "/chunks/oasis/invoices/create-client.64d30e96bc5206ab9937.hot-update.js",
+    "/chunks/oasis/invoices/create-client.642f393c08fb6f1c831b.hot-update.js": "/chunks/oasis/invoices/create-client.642f393c08fb6f1c831b.hot-update.js",
+    "/chunks/oasis/invoices/create-client.0ddb8761fd9adab52eba.hot-update.js": "/chunks/oasis/invoices/create-client.0ddb8761fd9adab52eba.hot-update.js",
+    "/chunks/oasis/invoices/create-client.9b06f652c377a5b6bd98.hot-update.js": "/chunks/oasis/invoices/create-client.9b06f652c377a5b6bd98.hot-update.js",
+    "/chunks/oasis/invoices/create-client.0a44668d658ab9bd40dc.hot-update.js": "/chunks/oasis/invoices/create-client.0a44668d658ab9bd40dc.hot-update.js",
+    "/chunks/oasis/invoices/create-client.469d93810858cf965af5.hot-update.js": "/chunks/oasis/invoices/create-client.469d93810858cf965af5.hot-update.js",
+    "/chunks/oasis/invoices/create-client.dca8f07173d3201b059d.hot-update.js": "/chunks/oasis/invoices/create-client.dca8f07173d3201b059d.hot-update.js",
+    "/chunks/oasis/invoices/create-client.6ede821f7e5c98b02a05.hot-update.js": "/chunks/oasis/invoices/create-client.6ede821f7e5c98b02a05.hot-update.js",
+    "/chunks/oasis/invoices/create-client.675de95a610e87e83ac1.hot-update.js": "/chunks/oasis/invoices/create-client.675de95a610e87e83ac1.hot-update.js",
+    "/chunks/oasis/invoices/create-client.7abaff6c71f7f68b590a.hot-update.js": "/chunks/oasis/invoices/create-client.7abaff6c71f7f68b590a.hot-update.js",
+    "/chunks/oasis/invoices/create-client.4285e71d7fd59cd5046a.hot-update.js": "/chunks/oasis/invoices/create-client.4285e71d7fd59cd5046a.hot-update.js",
+    "/chunks/oasis/invoices/create-client.a3902abbdc023e0797ba.hot-update.js": "/chunks/oasis/invoices/create-client.a3902abbdc023e0797ba.hot-update.js",
+    "/chunks/oasis/invoices/create-client.63ac5e8ce5d3cb59961f.hot-update.js": "/chunks/oasis/invoices/create-client.63ac5e8ce5d3cb59961f.hot-update.js",
+    "/chunks/oasis/invoices/create-client.7a66a9e25b9dfa1880e9.hot-update.js": "/chunks/oasis/invoices/create-client.7a66a9e25b9dfa1880e9.hot-update.js",
+    "/js/main.4a0cdb8bb0cf50cabab3.hot-update.js": "/js/main.4a0cdb8bb0cf50cabab3.hot-update.js",
+    "/chunks/oasis/invoices.47850c1ead416753b077.hot-update.js": "/chunks/oasis/invoices.47850c1ead416753b077.hot-update.js"
 }
diff --git a/resources/js/Oasis/Modules/Invoices/BillingProfile.vue b/resources/js/Oasis/Invoices/BillingProfile.vue
similarity index 98%
rename from resources/js/Oasis/Modules/Invoices/BillingProfile.vue
rename to resources/js/Oasis/Invoices/BillingProfile.vue
index cbfacd0a..d2ff56dd 100644
--- a/resources/js/Oasis/Modules/Invoices/BillingProfile.vue
+++ b/resources/js/Oasis/Invoices/BillingProfile.vue
@@ -10,7 +10,7 @@
 						<div class="form block-form">
 							<FormLabel>Company & Logo</FormLabel>
 							<InfoBox>
-								Here you can set your <b class="text-theme">billing profile</b> which will be paste to your every newly generated invoice.
+								<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">
diff --git a/resources/js/Oasis/Invoices/CreateClient.vue b/resources/js/Oasis/Invoices/CreateClient.vue
new file mode 100644
index 00000000..8aee1b37
--- /dev/null
+++ b/resources/js/Oasis/Invoices/CreateClient.vue
@@ -0,0 +1,273 @@
+<template>
+	<div id="single-page">
+		<MobileHeader :title="$router.currentRoute.meta.title" />
+		<PageHeader :title="$router.currentRoute.meta.title" />
+
+		<div id="page-content" class="medium-width">
+			<div class="content-page">
+				<ValidationObserver @submit.prevent="createClient" ref="createClient" v-slot="{ invalid }" tag="form" class="form block-form">
+					<PageTab>
+						 <PageTabGroup>
+							<FormLabel>Company & Logo</FormLabel>
+
+							<div class="block-wrapper">
+								<label>Logo (optional):</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="avatar" v-slot="{ errors }">
+									<ImageInput v-model="client.avatar" :error="errors[0]" />
+								</ValidationProvider>
+							</div>
+
+							<div class="block-wrapper">
+								<label>Company name:</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="name" rules="required" v-slot="{ errors }">
+									<input v-model="client.name" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+									<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+								</ValidationProvider>
+							</div>
+						</PageTabGroup>
+						 <PageTabGroup>
+							<FormLabel>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="client.ico" placeholder="" 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 (optional):</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="dic" v-slot="{ errors }">
+									<input v-model="client.dic" placeholder="" 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="client.ic_dph" placeholder="" type="text" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+									<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+								</ValidationProvider>
+							</div>
+						 </PageTabGroup>
+						 <PageTabGroup>
+							<FormLabel>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="client.address" placeholder="" 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>City:</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="city" rules="required" v-slot="{ errors }">
+									<input v-model="client.city" placeholder="" 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="client.postal_code" placeholder="" 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>Country:</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="country" rules="required" v-slot="{ errors }">
+									<SelectInput v-model="client.country" :default="client.country" :options="countries" placeholder="" :isError="errors[0]" />
+									<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+								</ValidationProvider>
+							</div>
+						 </PageTabGroup>
+						 <PageTabGroup>
+							<FormLabel>Contact Informations</FormLabel>
+
+							<div class="block-wrapper">
+								<label>Phone (optional):</label>
+								<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="phone_number" v-slot="{ errors }">
+									<input v-model="client.phone_number" placeholder="" 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="client.email" placeholder="" type="email" :class="{'is-error': errors[0]}" class="focus-border-theme" />
+									<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+								</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 :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit">
+									Create Client
+								</ButtonBase>
+							 </div>
+						 </PageTabGroup>
+					</PageTab>
+				</ValidationObserver>
+			</div>
+		</div>
+	</div>
+
+</template>
+
+<script>
+    import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+	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: 'CreateClient',
+		components: {
+			ValidationProvider,
+			ValidationObserver,
+			PageTabGroup,
+			MobileHeader,
+			SelectInput,
+			ImageInput,
+			PageHeader,
+			ButtonBase,
+			ThemeLabel,
+			FormLabel,
+			required,
+			InfoBox,
+			PageTab,
+		},
+		computed: {
+			...mapGetters([
+				'countries',
+				'config',
+			]),
+		},
+		data() {
+			return {
+				isLoading: false,
+				isError: false,
+				_client: {
+					avatar: undefined,
+					name: undefined,
+					email: undefined,
+					phone_number: undefined,
+					address: undefined,
+					city: undefined,
+					postal_code: undefined,
+					country: undefined,
+					ico: undefined,
+					dic: undefined,
+					ic_dph: undefined,
+				},
+				client: {
+					avatar: undefined,
+					name: 'MakingCG s.r.o.',
+					email: 'info@makingcg.com',
+					phone_number: '+421950123456',
+					address: 'Karpatske namestie',
+					city: 'Bratislava',
+					postal_code: '04001',
+					country: 'SK',
+					ico: '4153514345',
+					dic: '5346542865',
+					ic_dph: 'SK200543253553',
+				},
+			}
+		},
+		methods: {
+			async createClient() {
+
+				const isValid = await this.$refs.createClient.validate();
+
+				if (!isValid) {
+					this.isError = true
+					return
+				};
+
+				// Start loading
+				this.isLoading = true
+
+				// Create form
+				let formData = new FormData()
+
+				// Append data to form
+				Object.keys(this.client).forEach(key => {
+					formData.append(key, this.client[key])
+				})
+
+				// Send request to get user token
+				axios
+					.post('/api/oasis/clients', formData, {
+						headers: {
+							'Content-Type': 'multipart/form-data',
+						}
+					})
+					.then(response => {
+
+						events.$emit('toaster', {
+							type: 'success',
+							message: 'Client was created successfully',
+						})
+
+						// Go to User page
+						//this.$router.push({name: 'UserDetail', params: {id: response.data.data.id}})
+					})
+					.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.createClient.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/Modules/Invoices/Invoice.vue b/resources/js/Oasis/Invoices/Invoice.vue
similarity index 88%
rename from resources/js/Oasis/Modules/Invoices/Invoice.vue
rename to resources/js/Oasis/Invoices/Invoice.vue
index 883da5fe..ebcdefd2 100644
--- a/resources/js/Oasis/Modules/Invoices/Invoice.vue
+++ b/resources/js/Oasis/Invoices/Invoice.vue
@@ -50,7 +50,7 @@
 							<edit2-icon size="17" />
 						</div>
 						<div class="label text-theme">
-							Billing Profile
+							My Billing Profile
 						</div>
 					</router-link>
 				</ContentGroup>
@@ -62,11 +62,11 @@
 </template>
 
 <script>
-    import InvoiceSortingMobile from '@/Oasis/Modules/Invoices/components/InvoiceSortingMobile'
-	import InvoiceFilterMobile from '@/Oasis/Modules/Invoices/components/InvoiceFilterMobile'
-	import InvoiceMobileMenu from '@/Oasis/Modules/Invoices/components/InvoiceMobileMenu'
-	import ClientMobileMenu from '@/Oasis/Modules/Invoices/components/ClientMobileMenu'
-	import InvoiceCreateMenu from '@/Oasis/Modules/Invoices/components/InvoiceCreateMenu'
+    import InvoiceSortingMobile from '@/Oasis/Invoices/components/InvoiceSortingMobile'
+	import InvoiceFilterMobile from '@/Oasis/Invoices/components/InvoiceFilterMobile'
+	import InvoiceMobileMenu from '@/Oasis/Invoices/components/InvoiceMobileMenu'
+	import ClientMobileMenu from '@/Oasis/Invoices/components/ClientMobileMenu'
+	import InvoiceCreateMenu from '@/Oasis/Invoices/components/InvoiceCreateMenu'
 
 	import {UsersIcon, FileTextIcon, ClockIcon, Edit2Icon} from 'vue-feather-icons'
 	import SidebarNavigation from '@/components/Sidebar/SidebarNavigation'
diff --git a/resources/js/Oasis/Modules/Invoices/InvoicesView.vue b/resources/js/Oasis/Invoices/InvoicesView.vue
similarity index 76%
rename from resources/js/Oasis/Modules/Invoices/InvoicesView.vue
rename to resources/js/Oasis/Invoices/InvoicesView.vue
index 8d1209cf..9b5e5904 100644
--- a/resources/js/Oasis/Modules/Invoices/InvoicesView.vue
+++ b/resources/js/Oasis/Invoices/InvoicesView.vue
@@ -7,9 +7,9 @@
 </template>
 
 <script>
-    import InvoiceDesktopToolbar from '@/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar'
-	import InvoiceBrowser from '@/Oasis/Modules/Invoices/components/InvoiceBrowser'
-	import InvoiceContextMenu from '@/Oasis/Modules/Invoices/components/InvoiceContextMenu'
+    import InvoiceDesktopToolbar from '@/Oasis/Invoices/components/InvoiceDesktopToolbar'
+	import InvoiceBrowser from '@/Oasis/Invoices/components/InvoiceBrowser'
+	import InvoiceContextMenu from '@/Oasis/Invoices/components/InvoiceContextMenu'
 	import {events} from '@/bus'
 
 	export default {
diff --git a/resources/js/Oasis/Modules/Invoices/components/ClientItem.vue b/resources/js/Oasis/Invoices/components/ClientItem.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/ClientItem.vue
rename to resources/js/Oasis/Invoices/components/ClientItem.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/ClientMobileMenu.vue b/resources/js/Oasis/Invoices/components/ClientMobileMenu.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/ClientMobileMenu.vue
rename to resources/js/Oasis/Invoices/components/ClientMobileMenu.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceActionsMobile.vue b/resources/js/Oasis/Invoices/components/InvoiceActionsMobile.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceActionsMobile.vue
rename to resources/js/Oasis/Invoices/components/InvoiceActionsMobile.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue b/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
similarity index 94%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue
rename to resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
index b0b35be8..054ce718 100644
--- a/resources/js/Oasis/Modules/Invoices/components/InvoiceBrowser.vue
+++ b/resources/js/Oasis/Invoices/components/InvoiceBrowser.vue
@@ -62,10 +62,10 @@
 </template>
 
 <script>
-    import InvoiceActionsMobile from '@/Oasis/Modules/Invoices/components/InvoiceActionsMobile'
-	import InvoiceInfoSidebar from '@/Oasis/Modules/Invoices/components/InvoiceInfoSidebar'
-	import InvoiceItem from '@/Oasis/Modules/Invoices/components/InvoiceItem'
-	import ClientItem from '@/Oasis/Modules/Invoices/components/ClientItem'
+    import InvoiceActionsMobile from '@/Oasis/Invoices/components/InvoiceActionsMobile'
+	import InvoiceInfoSidebar from '@/Oasis/Invoices/components/InvoiceInfoSidebar'
+	import InvoiceItem from '@/Oasis/Invoices/components/InvoiceItem'
+	import ClientItem from '@/Oasis/Invoices/components/ClientItem'
 	import EmptyFilePage from '@/components/FilesView/EmptyFilePage'
 	import MobileToolbar from '@/components/FilesView/MobileToolbar'
 	import EmptyMessage from '@/components/FilesView/EmptyMessage'
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceContextMenu.vue b/resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceContextMenu.vue
rename to resources/js/Oasis/Invoices/components/InvoiceContextMenu.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue b/resources/js/Oasis/Invoices/components/InvoiceCreateMenu.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceCreateMenu.vue
rename to resources/js/Oasis/Invoices/components/InvoiceCreateMenu.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue b/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue
similarity index 97%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue
rename to resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue
index 4cc8ac33..27621af2 100644
--- a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue
+++ b/resources/js/Oasis/Invoices/components/InvoiceDesktopToolbar.vue
@@ -27,7 +27,7 @@
 								<Option title="Create Advance Invoice" icon="clock" />
 							</OptionGroup>
 							<OptionGroup>
-								<Option title="Create Client" icon="user-plus" />
+								<Option @click.native="createClient" title="Create Client" icon="user-plus" />
 							</OptionGroup>
 						</PopoverItem>
 					</PopoverWrapper>
@@ -115,6 +115,9 @@
 			}
 		},
 		methods: {
+			createClient() {
+				this.$router.push({name: 'CreateClient'})
+			},
 			showSortingMenu() {
 				events.$emit('popover:open', 'desktop-sorting')
 			},
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceFilterMobile.vue b/resources/js/Oasis/Invoices/components/InvoiceFilterMobile.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceFilterMobile.vue
rename to resources/js/Oasis/Invoices/components/InvoiceFilterMobile.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceInfoSidebar.vue b/resources/js/Oasis/Invoices/components/InvoiceInfoSidebar.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceInfoSidebar.vue
rename to resources/js/Oasis/Invoices/components/InvoiceInfoSidebar.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceItem.vue b/resources/js/Oasis/Invoices/components/InvoiceItem.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceItem.vue
rename to resources/js/Oasis/Invoices/components/InvoiceItem.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceMobileMenu.vue b/resources/js/Oasis/Invoices/components/InvoiceMobileMenu.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceMobileMenu.vue
rename to resources/js/Oasis/Invoices/components/InvoiceMobileMenu.vue
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceSortingMobile.vue b/resources/js/Oasis/Invoices/components/InvoiceSortingMobile.vue
similarity index 100%
rename from resources/js/Oasis/Modules/Invoices/components/InvoiceSortingMobile.vue
rename to resources/js/Oasis/Invoices/components/InvoiceSortingMobile.vue
diff --git a/resources/js/router.js b/resources/js/router.js
index 3c35b004..ce6eaec0 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -76,7 +76,7 @@ const routesOasis = [
         name: 'Invoicing',
         path: '/invoice',
         component: () =>
-            import(/* webpackChunkName: "chunks/oasis/invoices" */ './Oasis/Modules/Invoices/Invoice'),
+            import(/* webpackChunkName: "chunks/oasis/invoices" */ './Oasis/Invoices/Invoice'),
         meta: {
             requiresAuth: true,
             title: 'Faktúry'
@@ -86,7 +86,7 @@ const routesOasis = [
                 name: 'InvoicesList',
                 path: '/invoice/invoices',
                 component: () =>
-                    import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Modules/Invoices/InvoicesView'),
+                    import(/* webpackChunkName: "chunks/oasis/invoices/list" */ './Oasis/Invoices/InvoicesView'),
                 meta: {
                     requiresAuth: true,
                     title: 'Invoices'
@@ -96,10 +96,20 @@ const routesOasis = [
                 name: 'InvoicesProfile',
                 path: '/invoice/profile',
                 component: () =>
-                    import(/* webpackChunkName: "chunks/oasis/invoices/profile" */ './Oasis/Modules/Invoices/BillingProfile'),
+                    import(/* webpackChunkName: "chunks/oasis/invoices/profile" */ './Oasis/Invoices/BillingProfile'),
                 meta: {
                     requiresAuth: true,
-                    title: 'Billing Profile'
+                    title: 'My Billing Profile'
+                },
+            },
+            {
+                name: 'CreateClient',
+                path: '/invoice/create-client',
+                component: () =>
+                    import(/* webpackChunkName: "chunks/oasis/invoices/create-client" */ './Oasis/Invoices/CreateClient'),
+                meta: {
+                    requiresAuth: true,
+                    title: 'Create Client'
                 },
             }
         ]
diff --git a/tests/Feature/Oasis/OasisClientTest.php b/tests/Feature/Oasis/OasisClientTest.php
index f0483bc3..9cbd7c69 100644
--- a/tests/Feature/Oasis/OasisClientTest.php
+++ b/tests/Feature/Oasis/OasisClientTest.php
@@ -46,12 +46,15 @@ class OasisClientTest extends TestCase
         $this->postJson('/api/oasis/clients', [
             'avatar'       => $avatar,
             'name'         => 'VueFileManager Inc.',
+
             'email'        => 'howdy@hi5ve.digital',
             'phone_number' => '+421 950 123 456',
+
             'address'      => 'Does 12',
             'city'         => 'Bratislava',
             'postal_code'  => '076 54',
             'country'      => 'SK',
+
             'ico'          => '11111111',
             'dic'          => '11111111',
             'ic_dph'       => 'SK11111111',