diff --git a/app/Http/Controllers/Oasis/AdminController.php b/app/Http/Controllers/Oasis/AdminController.php
index 6ca43b5d..a3dc7fc3 100644
--- a/app/Http/Controllers/Oasis/AdminController.php
+++ b/app/Http/Controllers/Oasis/AdminController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Oasis;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\UserResource;
 use App\Models\User;
+use App\Models\UserSettings;
 use App\Notifications\Oasis\PaymentRequiredNotification;
 use App\Services\Oasis\CzechRegisterSearchService;
 use App\Services\StripeService;
@@ -52,19 +53,22 @@ class AdminController extends Controller
             'password' => Hash::make(Str::random()),
         ]);
 
+        UserSettings::unguard();
+
         // Store user settings
         $newbie
             ->settings()
             ->create([
-                'ico'          => $request->ico,
-                '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,
-                'timezone'     => '1.0',
+                'storage_capacity' => 0,
+                'ico'              => $request->ico,
+                '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,
+                'timezone'         => '1.0',
             ]);
 
         // Store subscription request
diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 6fac4544..577cf12d 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -400,7 +400,11 @@ function get_storage_fill_percentage($used, $capacity)
     $total = intval(Metric::gigabytes($capacity)->numberOfBytes());
 
     // Count progress
-    $progress = ($used * 100) / $total;
+    if ($total == 0) {
+        $progress = 100;
+    } else {
+        $progress = ($used * 100) / $total;
+    }
 
     // Return in 2 decimal
     return number_format((float)$progress, 2, '.', '');
@@ -409,6 +413,8 @@ function get_storage_fill_percentage($used, $capacity)
 /**
  * Get user capacity fill by percentage
  *
+ * @param $id
+ * @param null $additionals
  * @return string
  */
 function user_storage_percentage($id, $additionals = null)
diff --git a/resources/js/Oasis/Admin/Users.vue b/resources/js/Oasis/Admin/Users.vue
index 7b7ce840..2370eda2 100644
--- a/resources/js/Oasis/Admin/Users.vue
+++ b/resources/js/Oasis/Admin/Users.vue
@@ -49,14 +49,20 @@
                                 </span>
                             </td>
                             <td>
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.used_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td v-if="config.storageLimit">
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.capacity_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td>
                                 <span class="cell-item">
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 5aabe7dd..79ad2c4f 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -44,14 +44,20 @@
                                 </span>
                             </td>
                             <td>
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.used_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td v-if="config.storageLimit">
-                                <span class="cell-item">
+                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
                                     {{ row.data.attributes.storage.capacity_formatted }}
                                 </span>
+                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
+                                    -
+                                </span>
                             </td>
                             <td>
                                 <span class="cell-item">
diff --git a/tests/Feature/Oasis/OasisAdminTest.php b/tests/Feature/Oasis/OasisAdminTest.php
index eb5b0d2a..cf359c58 100644
--- a/tests/Feature/Oasis/OasisAdminTest.php
+++ b/tests/Feature/Oasis/OasisAdminTest.php
@@ -99,6 +99,7 @@ class OasisAdminTest extends TestCase
         $this->assertDatabaseHas('user_settings', [
             'ico'                => '08995281',
             'payment_activation' => 0,
+            'storage_capacity'   => 0,
         ]);
 
         $newbie = User::whereEmail('john@doe.com')