diff --git a/resources/js/helpers/ValidatorHelpers.js b/resources/js/helpers/ValidatorHelpers.js
index b753540f..a68bb0ab 100644
--- a/resources/js/helpers/ValidatorHelpers.js
+++ b/resources/js/helpers/ValidatorHelpers.js
@@ -3,7 +3,7 @@ import store from '../store/index'
 const ValidatorHelpers = {
     install(Vue) {
         Vue.prototype.$cantInviteMember = function (email, invitations) {
-            if (store.getters.config.subscriptionType === 'metered') {
+            if (['metered', 'none'].includes(store.getters.config.subscriptionType)) {
                 return false
             }
 
@@ -28,9 +28,7 @@ const ValidatorHelpers = {
         Vue.prototype.$reCaptchaToken = async function (action) {
             await this.$recaptchaLoaded()
 
-            let token = await this.$recaptcha(action)
-
-            return token
+            return await this.$recaptcha(action)
         }
     },
 }
diff --git a/resources/js/views/Admin/Users/User.vue b/resources/js/views/Admin/Users/User.vue
index 536d09c5..aa2eab6f 100644
--- a/resources/js/views/Admin/Users/User.vue
+++ b/resources/js/views/Admin/Users/User.vue
@@ -9,7 +9,7 @@
                     <img
                         :src="user.data.relationships.settings.data.attributes.avatar.sm"
                         :alt="user.data.relationships.settings.data.attributes.name"
-                        class="relative z-0 h-14 w-14 cursor-pointer rounded-xl object-cover shadow-lg md:h-16 md:w-16"
+                        class="relative z-0 h-14 w-14 rounded-xl object-cover shadow-lg md:h-16 md:w-16"
                     />
 
                     <!--User name & email-->
diff --git a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
index e8e3abe9..7c87f39b 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
@@ -10,7 +10,7 @@
                 {{ storage.data.attributes.used }}
             </b>
 
-            <b v-if="['fixed', 'none'].includes(config.subscriptionType)" class="mt-0.5 block text-sm text-gray-400">
+            <b v-if="config.subscriptionType === 'fixed' || (config.subscriptionType === 'none' && config.storageLimit)" class="mt-0.5 block text-sm text-gray-400">
                 {{ $t('Total of') }} {{ storage.data.attributes.capacity }}
                 {{ $t('Used') }}
             </b>
diff --git a/resources/js/views/User/Storage.vue b/resources/js/views/User/Storage.vue
index 4baf6a87..083aac66 100644
--- a/resources/js/views/User/Storage.vue
+++ b/resources/js/views/User/Storage.vue
@@ -14,7 +14,7 @@
                 {{ $t('Used') }}
             </b>
 
-            <ProgressLine :data="distribution" class="mt-5" />
+            <ProgressLine v-if="storage.data.attributes.used !== '0B'" :data="distribution" class="mt-5" />
         </div>
         <div v-if="distribution" class="card shadow-card">
             <FormLabel icon="hard-drive">
diff --git a/src/App/Console/Commands/SetupProdEnvironment.php b/src/App/Console/Commands/SetupProdEnvironment.php
index 51f29f5b..96e4822c 100644
--- a/src/App/Console/Commands/SetupProdEnvironment.php
+++ b/src/App/Console/Commands/SetupProdEnvironment.php
@@ -66,6 +66,11 @@ class SetupProdEnvironment extends Command
         $this->info('Clearing application cache...');
         $this->clear_cache();
 
+        $this->info('Dispatching jobs...');
+        $this->call('queue:work', [
+            '--stop-when-empty' => true,
+        ]);
+
         $this->warn('Please make sure your current host/domain where you are running app is included in your .env SANCTUM_STATEFUL_DOMAINS variable.');
 
         $this->info('Everything is done, congratulations! 🥳🥳🥳');