diff --git a/app/Http/Controllers/Oasis/AdminController.php b/app/Http/Controllers/Oasis/AdminController.php
index 979a05e0..e7661913 100644
--- a/app/Http/Controllers/Oasis/AdminController.php
+++ b/app/Http/Controllers/Oasis/AdminController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Oasis;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\CreateUserByAdmin;
+use App\Http\Requests\Oasis\CreateOrderRequest;
 use App\Http\Resources\UserResource;
 use App\Models\User;
 use App\Models\UserSettings;
@@ -43,10 +44,10 @@ class AdminController extends Controller
     /**
      * Register new client and send email with payment details
      *
-     * @param Request $request
+     * @param CreateOrderRequest $request
      * @return Application|ResponseFactory|Response
      */
-    public function create_order(Request $request)
+    public function create_order(CreateOrderRequest $request)
     {
         // Create user
         $newbie = User::create([
@@ -61,14 +62,14 @@ class AdminController extends Controller
             ->settings()
             ->create([
                 'storage_capacity' => 0,
-                'ico'              => $request->ico,
+                'ico'              => $request->ico ?? null,
                 'name'             => $request->name,
                 'address'          => $request->address,
                 'state'            => $request->state,
                 'city'             => $request->city,
                 'postal_code'      => $request->postal_code,
                 'country'          => $request->country,
-                'phone_number'     => $request->phone_number,
+                'phone_number'     => $request->phone_number ?? null,
                 'timezone'         => '1.0',
             ]);
 
diff --git a/app/Http/Requests/Oasis/CreateOrderRequest.php b/app/Http/Requests/Oasis/CreateOrderRequest.php
new file mode 100644
index 00000000..8b2cfdcc
--- /dev/null
+++ b/app/Http/Requests/Oasis/CreateOrderRequest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Requests\Oasis;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateOrderRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'ico'          => 'sometimes|nullable',
+            'name'         => 'required|string',
+            'email'        => 'required|email|unique:users',
+            'phone_number' => 'string|nullable',
+            'address'      => 'required|string',
+            'state'        => 'required|string',
+            'city'         => 'required|string',
+            'postal_code'  => 'required|string',
+            'country'      => 'required|string',
+            'plan'         => 'required|string',
+        ];
+    }
+}
diff --git a/app/Http/Resources/Oasis/SubscriptionRequestResource.php b/app/Http/Resources/Oasis/SubscriptionRequestResource.php
index 9bd5f195..78a9ca42 100644
--- a/app/Http/Resources/Oasis/SubscriptionRequestResource.php
+++ b/app/Http/Resources/Oasis/SubscriptionRequestResource.php
@@ -40,6 +40,7 @@ class SubscriptionRequestResource extends JsonResource
                                 'postal_code'  => $this->user->settings->postal_code,
                                 'country'      => $this->user->settings->country,
                                 'phone_number' => $this->user->settings->phone_number,
+                                'ico'          => $this->user->settings->ico,
                             ]
                         ]
                     ],
diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 577cf12d..362017a4 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -588,7 +588,7 @@ function get_image_meta_data($file)
  */
 function is_dev()
 {
-    return env('APP_ENV') === 'local' ? true : false;
+    return env('APP_ENV') === 'local' ? 1 : 0;
 }
 
 /**
diff --git a/app/Services/StripeService.php b/app/Services/StripeService.php
index f608df70..e63fc076 100644
--- a/app/Services/StripeService.php
+++ b/app/Services/StripeService.php
@@ -199,6 +199,9 @@ class StripeService
                 'country'     => $user->settings->country,
                 'postal_code' => $user->settings->postal_code,
                 'state'       => $user->settings->state,
+            ],
+            'preferred_locales' => [
+                $user->settings->country, 'en'
             ]
         ]);
     }
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index fc3c2082..5d4e907d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -43,7 +43,7 @@
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=b3b06b9cde99ec028464",
     "/chunks/invoices.js": "/chunks/invoices.js?id=fb3086d4984c78e21fec",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e",
-    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=e229c792aa5ec204062a",
+    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=ba0ca16ed7a894ab7b45",
     "/chunks/oasis/platba~chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/oasis/platba~chunks/upgrade-billing~chunks/upgrade-plan.js?id=7b1bc3a7d76622b569a3",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=e8ab4ed4bab28ca522d7",
     "/chunks/pages.js": "/chunks/pages.js?id=758c68bed61663f1d5e2",
@@ -54,12 +54,12 @@
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=08e2056bc3744b2ea8f9",
     "/chunks/plans.js": "/chunks/plans.js?id=ac14c512e6b0bb468e6d",
     "/chunks/platform.js": "/chunks/platform.js?id=3c073d2ec884d4f57730",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=0b29951663570ae2f4c4",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=29333fabd17fbc927e28",
     "/chunks/profile.js": "/chunks/profile.js?id=0ea1456d784fb585c986",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=9202f2cff7c80a561718",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=e00ee12cde704060e15b",
     "/chunks/settings.js": "/chunks/settings.js?id=5dc3f87035c3de10772e",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=8a53bfbc07b19733e0fd",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=199ff053f2149462706b",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=066580373fed08097cec",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=d24053a92c2594439d04",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=cd117263d898a871f7f9",
@@ -76,10 +76,10 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=93a33f9384c55ae05c44",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=90fc5f3cec8d6270aa24",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=90c1aa9431689a89eb3d",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=594d3eaeecf4773f655a",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=90df952b78538147a063",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a868c7c1743a871f5787",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=27c55352b44d0230b05f",
     "/chunks/user.js": "/chunks/user.js?id=74d6fc3aec1bb1fcf96e",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=66fa2426a1c5389c2072",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=9ecf41b547d52a150ed6",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=5af2fc09b4b639452756",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=521f134db4932f76808c",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=6c4d0e9e058be11dc1f7",
@@ -340,5 +340,194 @@
     "/chunks/settings.4524f3f67264a3c30f76.hot-update.js": "/chunks/settings.4524f3f67264a3c30f76.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.6aab8247260b54919339.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.6aab8247260b54919339.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.8959c594a18b3792029d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.8959c594a18b3792029d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.b1c8e6e6d9b738bf9a04.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.b1c8e6e6d9b738bf9a04.hot-update.js"
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.b1c8e6e6d9b738bf9a04.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.b1c8e6e6d9b738bf9a04.hot-update.js",
+    "/js/main.1e09204bb821df7933cc.hot-update.js": "/js/main.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/admin-account.1e09204bb821df7933cc.hot-update.js": "/chunks/admin-account.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~9fa266bc.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~9fa266bc.js?id=ccdd01df520484db752a",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/admin~chunks/platform.1e09204bb821df7933cc.hot-update.js": "/chunks/admin~chunks/platform.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-appearance.1e09204bb821df7933cc.hot-update.js": "/chunks/app-appearance.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-billings.1e09204bb821df7933cc.hot-update.js": "/chunks/app-billings.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-email.1e09204bb821df7933cc.hot-update.js": "/chunks/app-email.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-index.1e09204bb821df7933cc.hot-update.js": "/chunks/app-index.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-others.1e09204bb821df7933cc.hot-update.js": "/chunks/app-others.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-payments.1e09204bb821df7933cc.hot-update.js": "/chunks/app-payments.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/app-setup.1e09204bb821df7933cc.hot-update.js": "/chunks/app-setup.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/billings-detail.1e09204bb821df7933cc.hot-update.js": "/chunks/billings-detail.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/contact-us.1e09204bb821df7933cc.hot-update.js": "/chunks/contact-us.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/dashboard.1e09204bb821df7933cc.hot-update.js": "/chunks/dashboard.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.1e09204bb821df7933cc.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.1e09204bb821df7933cc.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/database.1e09204bb821df7933cc.hot-update.js": "/chunks/database.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/environment-setup.1e09204bb821df7933cc.hot-update.js": "/chunks/environment-setup.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js?id=31a17ad1d2536342abbe",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js": "/chunks/files~chunks/shared/file-browser.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/installation-disclaimer.1e09204bb821df7933cc.hot-update.js": "/chunks/installation-disclaimer.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/invoices.1e09204bb821df7933cc.hot-update.js": "/chunks/invoices.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/page-edit.1e09204bb821df7933cc.hot-update.js": "/chunks/page-edit.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/pages.1e09204bb821df7933cc.hot-update.js": "/chunks/pages.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/plan-create.1e09204bb821df7933cc.hot-update.js": "/chunks/plan-create.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/plan-delete.1e09204bb821df7933cc.hot-update.js": "/chunks/plan-delete.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/plan-settings.1e09204bb821df7933cc.hot-update.js": "/chunks/plan-settings.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/plan-subscribers.1e09204bb821df7933cc.hot-update.js": "/chunks/plan-subscribers.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/plans.1e09204bb821df7933cc.hot-update.js": "/chunks/plans.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/platform.1e09204bb821df7933cc.hot-update.js": "/chunks/platform.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/platform~chunks/shared.1e09204bb821df7933cc.hot-update.js": "/chunks/platform~chunks/shared.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/profile.1e09204bb821df7933cc.hot-update.js": "/chunks/profile.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/settings.1e09204bb821df7933cc.hot-update.js": "/chunks/settings.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/settings-create-payment-methods.1e09204bb821df7933cc.hot-update.js": "/chunks/settings-create-payment-methods.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/settings-invoices.1e09204bb821df7933cc.hot-update.js": "/chunks/settings-invoices.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/settings-password.1e09204bb821df7933cc.hot-update.js": "/chunks/settings-password.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/settings-payment-methods.1e09204bb821df7933cc.hot-update.js": "/chunks/settings-payment-methods.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/sign-up.1e09204bb821df7933cc.hot-update.js": "/chunks/sign-up.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/stripe-credentials.1e09204bb821df7933cc.hot-update.js": "/chunks/stripe-credentials.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/subscription-plans.1e09204bb821df7933cc.hot-update.js": "/chunks/subscription-plans.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/upgrade-billing.1e09204bb821df7933cc.hot-update.js": "/chunks/upgrade-billing.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e1658ebec711765f67fc",
+    "/chunks/upgrade-plan.1e09204bb821df7933cc.hot-update.js": "/chunks/upgrade-plan.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-create.1e09204bb821df7933cc.hot-update.js": "/chunks/user-create.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-delete.1e09204bb821df7933cc.hot-update.js": "/chunks/user-delete.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-detail.1e09204bb821df7933cc.hot-update.js": "/chunks/user-detail.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-invoices.1e09204bb821df7933cc.hot-update.js": "/chunks/user-invoices.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-password.1e09204bb821df7933cc.hot-update.js": "/chunks/user-password.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/user-storage.1e09204bb821df7933cc.hot-update.js": "/chunks/user-storage.1e09204bb821df7933cc.hot-update.js",
+    "/chunks/users.1e09204bb821df7933cc.hot-update.js": "/chunks/users.1e09204bb821df7933cc.hot-update.js",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~68e3c6cf.js?id=b490efdc8470a6c2f625",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~a4a4a595.js?id=be99c10088b00578891b",
+    "/js/main.8639e713e2af9225aaf2.hot-update.js": "/js/main.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/admin-account.8639e713e2af9225aaf2.hot-update.js": "/chunks/admin-account.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~9fa266bc.8639e713e2af9225aaf2.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~9fa266bc.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/admin~chunks/platform.8639e713e2af9225aaf2.hot-update.js": "/chunks/admin~chunks/platform.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-appearance.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-appearance.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-billings.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-billings.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-email.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-email.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-index.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-index.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-others.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-others.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-payments.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-payments.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/app-setup.8639e713e2af9225aaf2.hot-update.js": "/chunks/app-setup.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/billings-detail.8639e713e2af9225aaf2.hot-update.js": "/chunks/billings-detail.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/contact-us.8639e713e2af9225aaf2.hot-update.js": "/chunks/contact-us.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/dashboard.8639e713e2af9225aaf2.hot-update.js": "/chunks/dashboard.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.8639e713e2af9225aaf2.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.8639e713e2af9225aaf2.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/database.8639e713e2af9225aaf2.hot-update.js": "/chunks/database.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/environment-setup.8639e713e2af9225aaf2.hot-update.js": "/chunks/environment-setup.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js": "/chunks/files~chunks/shared/file-browser.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/installation-disclaimer.8639e713e2af9225aaf2.hot-update.js": "/chunks/installation-disclaimer.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/invoices.8639e713e2af9225aaf2.hot-update.js": "/chunks/invoices.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/page-edit.8639e713e2af9225aaf2.hot-update.js": "/chunks/page-edit.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/pages.8639e713e2af9225aaf2.hot-update.js": "/chunks/pages.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/plan-create.8639e713e2af9225aaf2.hot-update.js": "/chunks/plan-create.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/plan-delete.8639e713e2af9225aaf2.hot-update.js": "/chunks/plan-delete.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/plan-settings.8639e713e2af9225aaf2.hot-update.js": "/chunks/plan-settings.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/plan-subscribers.8639e713e2af9225aaf2.hot-update.js": "/chunks/plan-subscribers.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/plans.8639e713e2af9225aaf2.hot-update.js": "/chunks/plans.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/platform.8639e713e2af9225aaf2.hot-update.js": "/chunks/platform.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/platform~chunks/shared.8639e713e2af9225aaf2.hot-update.js": "/chunks/platform~chunks/shared.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/profile.8639e713e2af9225aaf2.hot-update.js": "/chunks/profile.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/settings.8639e713e2af9225aaf2.hot-update.js": "/chunks/settings.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/settings-create-payment-methods.8639e713e2af9225aaf2.hot-update.js": "/chunks/settings-create-payment-methods.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/settings-invoices.8639e713e2af9225aaf2.hot-update.js": "/chunks/settings-invoices.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/settings-password.8639e713e2af9225aaf2.hot-update.js": "/chunks/settings-password.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/settings-payment-methods.8639e713e2af9225aaf2.hot-update.js": "/chunks/settings-payment-methods.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/stripe-credentials.8639e713e2af9225aaf2.hot-update.js": "/chunks/stripe-credentials.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/subscription-plans.8639e713e2af9225aaf2.hot-update.js": "/chunks/subscription-plans.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/upgrade-billing.8639e713e2af9225aaf2.hot-update.js": "/chunks/upgrade-billing.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/upgrade-plan.8639e713e2af9225aaf2.hot-update.js": "/chunks/upgrade-plan.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-create.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-create.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-delete.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-delete.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-detail.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-detail.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-invoices.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-invoices.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-password.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-password.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/user-storage.8639e713e2af9225aaf2.hot-update.js": "/chunks/user-storage.8639e713e2af9225aaf2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.84681bbfd3b559903b15.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.84681bbfd3b559903b15.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.85f81051fc2b94030b90.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.85f81051fc2b94030b90.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.6b4616839fbc08147e71.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.6b4616839fbc08147e71.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.36bc09d14ff6b6f55846.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.36bc09d14ff6b6f55846.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.e0be1b3432f910dd55e9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.e0be1b3432f910dd55e9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.281207c37668919021a1.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.281207c37668919021a1.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.18f156a935cce5335891.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.18f156a935cce5335891.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.ef3b2630bda1b0afcf00.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.ef3b2630bda1b0afcf00.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.dea1df80733f010ad8a9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.dea1df80733f010ad8a9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.51ea7508bb9f22eaf348.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.51ea7508bb9f22eaf348.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.fb463f8dbb7c06aee6a9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.fb463f8dbb7c06aee6a9.hot-update.js",
+    "/js/main.f250b9743bb3d57d19c7.hot-update.js": "/js/main.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.f250b9743bb3d57d19c7.hot-update.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/sign-up.f250b9743bb3d57d19c7.hot-update.js": "/chunks/sign-up.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/upgrade-billing.f250b9743bb3d57d19c7.hot-update.js": "/chunks/upgrade-billing.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/upgrade-plan.f250b9743bb3d57d19c7.hot-update.js": "/chunks/upgrade-plan.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/user-create.f250b9743bb3d57d19c7.hot-update.js": "/chunks/user-create.f250b9743bb3d57d19c7.hot-update.js",
+    "/chunks/users.f250b9743bb3d57d19c7.hot-update.js": "/chunks/users.f250b9743bb3d57d19c7.hot-update.js",
+    "/js/main.9b2beccdcbee76c0c6c5.hot-update.js": "/js/main.9b2beccdcbee76c0c6c5.hot-update.js",
+    "/chunks/upgrade-billing.87d68353929cce8eff9a.hot-update.js": "/chunks/upgrade-billing.87d68353929cce8eff9a.hot-update.js",
+    "/chunks/upgrade-plan.37b47bf94ce431db0f6e.hot-update.js": "/chunks/upgrade-plan.37b47bf94ce431db0f6e.hot-update.js",
+    "/chunks/upgrade-plan.883d41abfe564a042471.hot-update.js": "/chunks/upgrade-plan.883d41abfe564a042471.hot-update.js",
+    "/chunks/upgrade-billing.ef56219c56bdff66ec35.hot-update.js": "/chunks/upgrade-billing.ef56219c56bdff66ec35.hot-update.js",
+    "/chunks/upgrade-billing.ad2075858984b1280db7.hot-update.js": "/chunks/upgrade-billing.ad2075858984b1280db7.hot-update.js",
+    "/chunks/oasis/platba.d02bac132c49b0ca8913.hot-update.js": "/chunks/oasis/platba.d02bac132c49b0ca8913.hot-update.js",
+    "/chunks/oasis/platba.4ca9c6aec6f72fcdcb95.hot-update.js": "/chunks/oasis/platba.4ca9c6aec6f72fcdcb95.hot-update.js",
+    "/chunks/oasis/platba.24f3b271950257364549.hot-update.js": "/chunks/oasis/platba.24f3b271950257364549.hot-update.js",
+    "/chunks/oasis/platba.c256f7bf75aac2443223.hot-update.js": "/chunks/oasis/platba.c256f7bf75aac2443223.hot-update.js",
+    "/chunks/oasis/platba.eaaeaa27ac6e921f41df.hot-update.js": "/chunks/oasis/platba.eaaeaa27ac6e921f41df.hot-update.js",
+    "/chunks/oasis/platba.57f2646e642cc7af8dee.hot-update.js": "/chunks/oasis/platba.57f2646e642cc7af8dee.hot-update.js",
+    "/chunks/oasis/platba.e4b625038f8fb35b3752.hot-update.js": "/chunks/oasis/platba.e4b625038f8fb35b3752.hot-update.js",
+    "/chunks/oasis/platba.3226edcf2e839655edd3.hot-update.js": "/chunks/oasis/platba.3226edcf2e839655edd3.hot-update.js",
+    "/chunks/oasis/platba.ca54dd7aba79c05084b2.hot-update.js": "/chunks/oasis/platba.ca54dd7aba79c05084b2.hot-update.js",
+    "/chunks/oasis/platba.15b7795e3dc4e98a8ddf.hot-update.js": "/chunks/oasis/platba.15b7795e3dc4e98a8ddf.hot-update.js",
+    "/chunks/oasis/platba.95929e0e4aa1aa23b9bc.hot-update.js": "/chunks/oasis/platba.95929e0e4aa1aa23b9bc.hot-update.js",
+    "/chunks/user-create.c83dedb8ccacde1fb10d.hot-update.js": "/chunks/user-create.c83dedb8ccacde1fb10d.hot-update.js",
+    "/chunks/user-create.d78bcb0a419f07b9411c.hot-update.js": "/chunks/user-create.d78bcb0a419f07b9411c.hot-update.js",
+    "/chunks/user-create.eb0711d67661966fd5f3.hot-update.js": "/chunks/user-create.eb0711d67661966fd5f3.hot-update.js",
+    "/chunks/user-create.0135c8b49cfa610ba6a9.hot-update.js": "/chunks/user-create.0135c8b49cfa610ba6a9.hot-update.js",
+    "/chunks/user-create.41479189429806fd1d34.hot-update.js": "/chunks/user-create.41479189429806fd1d34.hot-update.js",
+    "/chunks/user-create.5ffad57f12d730b32b02.hot-update.js": "/chunks/user-create.5ffad57f12d730b32b02.hot-update.js",
+    "/chunks/user-create.46b18303088cc8053030.hot-update.js": "/chunks/user-create.46b18303088cc8053030.hot-update.js",
+    "/chunks/user-create.085c93c62178686a6348.hot-update.js": "/chunks/user-create.085c93c62178686a6348.hot-update.js",
+    "/chunks/user-create.fabbbd8be80506192afb.hot-update.js": "/chunks/user-create.fabbbd8be80506192afb.hot-update.js",
+    "/chunks/user-create.15fcb89250749385993c.hot-update.js": "/chunks/user-create.15fcb89250749385993c.hot-update.js",
+    "/chunks/user-create.cab2f9dbbf48df9dfe44.hot-update.js": "/chunks/user-create.cab2f9dbbf48df9dfe44.hot-update.js",
+    "/chunks/user-create.c7a00a9319b613256795.hot-update.js": "/chunks/user-create.c7a00a9319b613256795.hot-update.js",
+    "/chunks/user-create.e7c64f30e3b8eb01133d.hot-update.js": "/chunks/user-create.e7c64f30e3b8eb01133d.hot-update.js",
+    "/chunks/user-create.c1abd929aa0487fdbf79.hot-update.js": "/chunks/user-create.c1abd929aa0487fdbf79.hot-update.js",
+    "/chunks/user-create.a2ec2cf8eb0fa9a726cd.hot-update.js": "/chunks/user-create.a2ec2cf8eb0fa9a726cd.hot-update.js",
+    "/chunks/user-create.11cb564d26a1bb42a0e1.hot-update.js": "/chunks/user-create.11cb564d26a1bb42a0e1.hot-update.js",
+    "/chunks/user-create.d0daabab2ed7009ee08d.hot-update.js": "/chunks/user-create.d0daabab2ed7009ee08d.hot-update.js",
+    "/chunks/user-create.61f06b6f17ef89992396.hot-update.js": "/chunks/user-create.61f06b6f17ef89992396.hot-update.js",
+    "/chunks/user-create.ed1c115e6b549c9646a8.hot-update.js": "/chunks/user-create.ed1c115e6b549c9646a8.hot-update.js",
+    "/chunks/user-create.74395097473c03a2f44d.hot-update.js": "/chunks/user-create.74395097473c03a2f44d.hot-update.js",
+    "/chunks/user-create.60916021d7ff57376ec1.hot-update.js": "/chunks/user-create.60916021d7ff57376ec1.hot-update.js",
+    "/chunks/user-create.bdba2c10a02d52aa3a21.hot-update.js": "/chunks/user-create.bdba2c10a02d52aa3a21.hot-update.js",
+    "/chunks/user-create.d3d7d131fce284b0e33d.hot-update.js": "/chunks/user-create.d3d7d131fce284b0e33d.hot-update.js",
+    "/js/main.82992adb869f74e65921.hot-update.js": "/js/main.82992adb869f74e65921.hot-update.js",
+    "/chunks/upgrade-billing.0bef34370d5ff744b2dc.hot-update.js": "/chunks/upgrade-billing.0bef34370d5ff744b2dc.hot-update.js",
+    "/chunks/upgrade-billing.5877b2c02e744e15e9ab.hot-update.js": "/chunks/upgrade-billing.5877b2c02e744e15e9ab.hot-update.js",
+    "/chunks/settings-create-payment-methods.a769f179f15d59fc2c5f.hot-update.js": "/chunks/settings-create-payment-methods.a769f179f15d59fc2c5f.hot-update.js",
+    "/chunks/oasis/platba.0f895a4ff4f82a5eef09.hot-update.js": "/chunks/oasis/platba.0f895a4ff4f82a5eef09.hot-update.js",
+    "/chunks/upgrade-billing.0f895a4ff4f82a5eef09.hot-update.js": "/chunks/upgrade-billing.0f895a4ff4f82a5eef09.hot-update.js",
+    "/chunks/platform~chunks/shared.697c76654913d87e13a3.hot-update.js": "/chunks/platform~chunks/shared.697c76654913d87e13a3.hot-update.js",
+    "/chunks/platform~chunks/shared.d6fb305157d541bd2faf.hot-update.js": "/chunks/platform~chunks/shared.d6fb305157d541bd2faf.hot-update.js",
+    "/chunks/platform~chunks/shared.cd16c0812657bc929c92.hot-update.js": "/chunks/platform~chunks/shared.cd16c0812657bc929c92.hot-update.js",
+    "/chunks/platform~chunks/shared.1b348c2a64335954ee0d.hot-update.js": "/chunks/platform~chunks/shared.1b348c2a64335954ee0d.hot-update.js",
+    "/chunks/platform~chunks/shared.9ddc8cb9af80eab1a3ab.hot-update.js": "/chunks/platform~chunks/shared.9ddc8cb9af80eab1a3ab.hot-update.js",
+    "/chunks/platform~chunks/shared.00e154a66593afd54f8c.hot-update.js": "/chunks/platform~chunks/shared.00e154a66593afd54f8c.hot-update.js",
+    "/chunks/platform~chunks/shared.cbb5c7c56499d8ba0e9e.hot-update.js": "/chunks/platform~chunks/shared.cbb5c7c56499d8ba0e9e.hot-update.js",
+    "/js/main.a241dd0755106d9a6d12.hot-update.js": "/js/main.a241dd0755106d9a6d12.hot-update.js",
+    "/js/main.9b07d4895cefc5d735b1.hot-update.js": "/js/main.9b07d4895cefc5d735b1.hot-update.js",
+    "/chunks/user-create.9b07d4895cefc5d735b1.hot-update.js": "/chunks/user-create.9b07d4895cefc5d735b1.hot-update.js",
+    "/chunks/upgrade-billing.d0e6f8243f9cbb84676b.hot-update.js": "/chunks/upgrade-billing.d0e6f8243f9cbb84676b.hot-update.js",
+    "/chunks/oasis/platba.a98868408621924d5d3c.hot-update.js": "/chunks/oasis/platba.a98868408621924d5d3c.hot-update.js",
+    "/chunks/upgrade-billing.2ceda03dd235f29f3c06.hot-update.js": "/chunks/upgrade-billing.2ceda03dd235f29f3c06.hot-update.js",
+    "/js/main.6f59cbfab1699a3646bd.hot-update.js": "/js/main.6f59cbfab1699a3646bd.hot-update.js",
+    "/chunks/oasis/platba.1776d012ae9548998600.hot-update.js": "/chunks/oasis/platba.1776d012ae9548998600.hot-update.js"
 }
diff --git a/resources/js/Oasis/Admin/UserCreateOrder.vue b/resources/js/Oasis/Admin/UserCreateOrder.vue
index 0928e104..dc4bce2b 100644
--- a/resources/js/Oasis/Admin/UserCreateOrder.vue
+++ b/resources/js/Oasis/Admin/UserCreateOrder.vue
@@ -19,10 +19,24 @@
                             </ValidationProvider>
                         </div>
 
+                        <div class="block-wrapper">
+                            <label>Plan:</label>
+                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Plan" v-slot="{ errors }">
+                                <SelectInput v-model="user.plan"
+                                             :default="user.country"
+                                             :options="plans"
+                                             placeholder="Vyberte plan"
+                                             :isError="errors[0]" />
+                                <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                            </ValidationProvider>
+                        </div>
+
+                        <FormLabel class="mt-70">{{ $t('user_settings.title_billing') }}</FormLabel>
+
                         <!--Name-->
                         <div class="block-wrapper">
-                            <label>ICO:</label>
-                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ICO" rules="required" v-slot="{ errors }">
+                            <label>ICO (volitelne):</label>
+                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ICO" v-slot="{ errors }">
                                 <input v-model="user.ico" placeholder="Type ICO" type="text" class="focus-border-theme" :class="{'is-error': errors[0]}" />
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                 <small v-if="fullDetails" class="input-help">
@@ -111,8 +125,8 @@
                         </div>
 
                         <div class="block-wrapper">
-                            <label>{{ $t('user_settings.phone_number') }}:</label>
-                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Phone Number" v-slot="{ errors }">
+                            <label>{{ $t('user_settings.phone_number') }} (volitelne):</label>
+                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Phone Number" v-slot="{ errors }">
                                 <input v-model="user.phone_number"
                                        :placeholder="$t('user_settings.phone_number_plac')"
                                        type="text"
@@ -122,18 +136,6 @@
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
-
-                        <div class="block-wrapper">
-                            <label>Plan:</label>
-                            <ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Plan" v-slot="{ errors }">
-                                <SelectInput v-model="user.plan"
-                                             :default="user.country"
-                                             :options="plans"
-                                             placeholder="Vyberte plan"
-                                             :isError="errors[0]" />
-                                <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
-                            </ValidationProvider>
-                        </div>
                     </div>
 
                     <div class="form-group">
@@ -237,8 +239,11 @@
                             if (error.response.data.errors['email']) {
 
                                 this.$refs.createUser.setErrors({
-                                    'email': error.response.data.errors['email']
+                                    'Email': error.response.data.errors['email']
                                 });
+
+                                // Scroll top
+                                document.getElementById('single-page').scrollTop = 0
                             }
                         } else {
 
diff --git a/resources/js/Oasis/Onboarding/PayForPlan.vue b/resources/js/Oasis/Onboarding/PayForPlan.vue
index 1d03a5a8..d9095220 100644
--- a/resources/js/Oasis/Onboarding/PayForPlan.vue
+++ b/resources/js/Oasis/Onboarding/PayForPlan.vue
@@ -4,7 +4,7 @@
             <MobileHeader :title="$router.currentRoute.meta.title" />
             <div class="content-page">
                 <div class="plan-title">
-                    <credit-card-icon size="42" class="title-icon"></credit-card-icon>
+                    <credit-card-icon size="42" class="title-icon text-theme" />
                     <h1>{{ $t('page_upgrade_account.title') }}</h1>
                     <h2>{{ $t('page_upgrade_account.desription') }}</h2>
                 </div>
@@ -16,7 +16,7 @@
 
                             <!-- Pay by new credit card -->
                             <div class="register-card">
-                                <InfoBox v-if="config.isDemo">
+                                <InfoBox v-if="config.isDemo || config.isDev">
                                     <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                                         as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                                 </InfoBox>
@@ -43,6 +43,7 @@
                                                    :placeholder="$t('user_settings.name_plac')"
                                                    type="text"
                                                    :class="{'is-error': errors[0]}"
+                                                   class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                         </ValidationProvider>
@@ -57,6 +58,7 @@
                                                    :placeholder="$t('user_settings.address_plac')"
                                                    type="text"
                                                    :class="{'is-error': errors[0]}"
+                                                   class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                         </ValidationProvider>
@@ -72,6 +74,7 @@
                                                        :placeholder="$t('user_settings.city_plac')"
                                                        type="text"
                                                        :class="{'is-error': errors[0]}"
+                                                       class="focus-border-theme"
                                                 />
                                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                             </ValidationProvider>
@@ -86,6 +89,7 @@
                                                        :placeholder="$t('user_settings.postal_code_plac')"
                                                        type="text"
                                                        :class="{'is-error': errors[0]}"
+                                                       class="focus-border-theme"
                                                 />
                                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                             </ValidationProvider>
@@ -115,6 +119,7 @@
                                                    :placeholder="$t('user_settings.state_plac')"
                                                    type="text"
                                                    :class="{'is-error': errors[0]}"
+                                                   class="focus-border-theme"
                                             />
                                             <small class="input-help">
                                                 State, county, province, or region.
@@ -132,6 +137,7 @@
                                                    :placeholder="$t('user_settings.phone_number_plac')"
                                                    type="text"
                                                    :class="{'is-error': errors[0]}"
+                                                   class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                                         </ValidationProvider>
@@ -385,6 +391,7 @@
             axios.get('/api/user/subscription/setup-intent')
                 .then(response => {
                     this.clientSecret = response.data.client_secret
+                    this.isLoading = false
                 })
                 .catch(() => {
                     this.$isSomethingWrong()
@@ -601,7 +608,7 @@
         margin: 0 auto 80px;
 
         path, line, polyline, rect, circle {
-            color: $theme;
+            color: inherit;
         }
 
         h1 {
diff --git a/resources/js/Oasis/Onboarding/SelectPlan.vue b/resources/js/Oasis/Onboarding/SelectPlan.vue
index 9fce1927..50b6e106 100644
--- a/resources/js/Oasis/Onboarding/SelectPlan.vue
+++ b/resources/js/Oasis/Onboarding/SelectPlan.vue
@@ -6,7 +6,7 @@
 
                 <!--Page Title-->
                 <div class="plan-title">
-                    <cloud-icon size="42" class="title-icon"></cloud-icon>
+                    <cloud-icon size="42" class="title-icon text-theme" />
                     <h1>{{ $t('page_pricing_tables.title') }}</h1>
                     <h2>{{ $t('page_pricing_tables.description') }}</h2>
                 </div>
@@ -81,7 +81,7 @@
         margin: 0 auto 80px;
 
         path, line, polyline, rect, circle {
-            color: $theme;
+            color: inherit;
         }
 
         h1 {
diff --git a/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue b/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
index 5298efb3..2e2b010b 100644
--- a/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
+++ b/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
@@ -18,7 +18,7 @@
 
                             <!-- Pay by new credit card -->
                             <div class="register-card form block-form">
-                                <InfoBox v-if="config.isDemo">
+                                <InfoBox v-if="config.isDemo || config.isDev">
                                     <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                                         as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                                 </InfoBox>
@@ -33,10 +33,11 @@
                                     </div>
                                 </div>
 
-                                <InfoBox>
+                                <InfoBox v-if="requestedPlan">
                                     <ListInfo class="billing">
-                                        <ListInfoItem class="billing-item" title="Spolecnost" content="CMPortal, s.r.o." />
-                                        <ListInfoItem class="billing-item" title="Adresa" content="Korytná 47/3, Praha 10000, Česká Republika" />
+                                        <ListInfoItem class="billing-item" title="Spolecnost" :content="requestedPlan.data.relationships.user.data.attributes.name" />
+                                        <ListInfoItem v-if="requestedPlan.data.relationships.user.data.attributes.ico" class="billing-item" title="ICO" :content="requestedPlan.data.relationships.user.data.attributes.ico" />
+                                        <ListInfoItem class="billing-item" title="Adresa" :content="address" />
                                     </ListInfo>
                                 </InfoBox>
                             </div>
@@ -152,6 +153,9 @@
                 return this.requestedPlan.data.relationships.plan.data.attributes.tax_rates.find(taxRate => {
                     return taxRate.country === this.requestedPlan.data.relationships.user.data.attributes.country
                 })
+            },
+            address() {
+                return this.requestedPlan.data.relationships.user.data.attributes.address + ', ' + this.requestedPlan.data.relationships.user.data.attributes.postal_code + ', ' + this.requestedPlan.data.relationships.user.data.attributes.city
             }
         },
         data() {
diff --git a/resources/js/components/FilesView/ButtonBase.vue b/resources/js/components/FilesView/ButtonBase.vue
index e5d859c6..3a950dfe 100644
--- a/resources/js/components/FilesView/ButtonBase.vue
+++ b/resources/js/components/FilesView/ButtonBase.vue
@@ -1,7 +1,7 @@
 <template>
     <button class="button-base" :class="buttonStyle" type="button">
         <div v-if="loading" class="icon">
-            <refresh-cw-icon size="16" class="sync-alt"></refresh-cw-icon>
+            <refresh-cw-icon size="16" class="sync-alt" />
 		</div>
         <div class="content">
             <slot v-if="! loading"></slot>
@@ -52,10 +52,6 @@
             .content {
                 color: white;
             }
-
-            polyline, path {
-                color: inherit;
-            }
         }
 
         &.danger {
diff --git a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
index b84363e7..494a8afe 100644
--- a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
+++ b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
@@ -1,13 +1,13 @@
 <template>
 	<div class="navigation-panel" v-if="fileInfoDetail[0]">
 		<div class="name-wrapper">
-			<x-icon @click="closeFullPreview" size="22" class="icon-close"></x-icon>
+			<x-icon @click="closeFullPreview" size="22" class="icon-close hover-text-theme" />
 			<div class="name-count-wrapper">
 				<p class="title">{{ fileInfoDetail[0].name }}</p>				
 				<span class="file-count"> ({{ showingImageIndex + ' ' + $t('pronouns.of') + ' ' + filteredFiles.length }}) </span>
 			</div>
-			<span id="fast-preview-menu" class="fast-menu-icon" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
-				<more-horizontal-icon class="more-icon" size="14"> </more-horizontal-icon>
+			<span id="fast-preview-menu" class="fast-menu-icon group" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
+				<more-horizontal-icon class="more-icon group-hover-text-theme" size="14" />
 			</span>
 		</div>
 
@@ -162,14 +162,13 @@ export default {
 		border-radius: 6px;
 		vertical-align: middle;
 		cursor: pointer;
-		color: $text;
 		@include transition(150ms);
 
 		&:hover {
 			background: $light_background;
 
 			line {
-				stroke: $theme;
+				color: inherit;
 			}
 		}
 	}
@@ -191,7 +190,7 @@ export default {
 			background: $light_background;
 
 			svg circle {
-				stroke: $theme;
+				color: inherit;
 			}
 		}
 		.more-icon {
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 4da2d06b..ea02f195 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -106,7 +106,7 @@ const Helpers = {
             // Push items to file queue
             [...event.dataTransfer.items].map(item => {
                 this.$store.commit('ADD_FILES_TO_QUEUE', {
-                    folder_id: parent_id,
+                    folder_id: parent_id ? parent_id : '',
                     file: item.getAsFile(),
                 })
             });
diff --git a/resources/js/router.js b/resources/js/router.js
index 430f62bb..c258e005 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -88,6 +88,16 @@ const routesOasis = [
                     title: i18n.t('routes_title.user_create')
                 },
             },
+            {
+                name: 'UserCreate',
+                path: '/admin/user/create',
+                component: () =>
+                    import(/* webpackChunkName: "chunks/user-create" */ './Oasis/Admin/UserCreate'),
+                meta: {
+                    requiresAuth: true,
+                    title: i18n.t('routes_title.user_create')
+                },
+            },
         ]
     },
 ]
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index d3e189fa..cb12a653 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -23,6 +23,8 @@ const defaultState = {
         },
     ],
     countries: [
+        {label: 'Czech Republic', value: 'CZ'},
+        {label: 'Slovakia', value: 'SK'},
         {label: 'Afghanistan', value: 'AF'},
         {label: 'Åland Islands', value: 'AX'},
         {label: 'Albania', value: 'AL'},
@@ -80,7 +82,6 @@ const defaultState = {
         {label: 'Croatia', value: 'HR'},
         {label: 'Cuba', value: 'CU'},
         {label: 'Cyprus', value: 'CY'},
-        {label: 'Czech Republic', value: 'CZ'},
         {label: 'Denmark', value: 'DK'},
         {label: 'Djibouti', value: 'DJ'},
         {label: 'Dominica', value: 'DM'},
@@ -219,7 +220,6 @@ const defaultState = {
         {label: 'Seychelles', value: 'SC'},
         {label: 'Sierra Leone', value: 'SL'},
         {label: 'Singapore', value: 'SG'},
-        {label: 'Slovakia', value: 'SK'},
         {label: 'Slovenia', value: 'SI'},
         {label: 'Solomon Islands', value: 'SB'},
         {label: 'Somalia', value: 'SO'},
diff --git a/resources/js/views/Upgrade/UpgradeBilling.vue b/resources/js/views/Upgrade/UpgradeBilling.vue
index e9aca7fc..86c9018b 100644
--- a/resources/js/views/Upgrade/UpgradeBilling.vue
+++ b/resources/js/views/Upgrade/UpgradeBilling.vue
@@ -16,7 +16,7 @@
 
                             <!-- Pay by new credit card -->
                             <div class="register-card" v-show="! defaultPaymentMethod || payByNewCard">
-                                <InfoBox v-if="config.isDemo">
+                                <InfoBox v-if="config.isDemo || config.isDev">
                                     <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                                         as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                                 </InfoBox>
diff --git a/resources/js/views/User/CreatePaymentMethod.vue b/resources/js/views/User/CreatePaymentMethod.vue
index 312de449..d1c914f8 100644
--- a/resources/js/views/User/CreatePaymentMethod.vue
+++ b/resources/js/views/User/CreatePaymentMethod.vue
@@ -6,7 +6,7 @@
 
                 <!-- Register new credit card -->
                 <div class="register-card">
-                    <InfoBox v-show="config.isDemo">
+                    <InfoBox v-if="config.isDemo || config.isDev">
                         <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                             as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                     </InfoBox>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 32981e7b..e11d108d 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -25,7 +25,7 @@
 
     {{--Icons--}}
     <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ asset('assets/images/app-icon.png') }}">
-    <link rel="icon" href="{{ $settings->app_favicon ?? asset('favicon.png') }}?v={{ get_version() }}">
+    <link rel="icon" href="{{ $settings->app_favicon ? url($settings->app_favicon) : asset('favicon.png') }}?v={{ get_version() }}">
 
     {{--Format Detection--}}
     <meta name="format-detection" content="telephone=no">
@@ -64,6 +64,8 @@
 
             isAuthenticated: {{ auth()->check() ? 1 : 0 }},
             isSaaS: {{ $settings && $settings->license === 'Extended' ? 1 : 0 }},
+
+            isDev: {{ is_dev() ? 1 : 0 }},
             isDemo: {{ config('vuefilemanager.is_demo') ? 1 : 0 }},
 
             legal: {!! $legal ?? 'undefined' !!},
diff --git a/resources/views/vuefilemanager/others/color-template.blade.php b/resources/views/vuefilemanager/others/color-template.blade.php
index 215e386b..074850d6 100644
--- a/resources/views/vuefilemanager/others/color-template.blade.php
+++ b/resources/views/vuefilemanager/others/color-template.blade.php
@@ -65,6 +65,12 @@
 
         {{-- ButtonBase --}}
         .button-base.theme-solid {background: {{ $settings->app_color }}}
+        .button-base.theme-solid polyline,
+        .button-base.theme-solid path {
+            color: white;
+        }
+
+
         .button-base.theme {background: {{ $settings->app_color }}10}
         .button-base.theme {color: {{ $settings->app_color }}}
         .button-base.theme .content {color: {{ $settings->app_color }}}
@@ -82,6 +88,9 @@
         .folder-item.is-dragenter {border-color: {{ $settings->app_color }} !important;}
         .favourites.is-dragenter .menu-list {border-color: {{ $settings->app_color }} !important;}
 
+        {{-- Stripe --}}
+        .StripeElement--focus {border-color: {{ $settings->app_color }} !important;}
+
         {{-- Dark mode --}}
         @media (prefers-color-scheme: dark) {
             .dark-text-theme {color: {{ $settings->app_color }}}