diff --git a/resources/js/components/Admin/WidgetLatestRegistrations.vue b/resources/js/components/Admin/WidgetLatestRegistrations.vue
index 660ee3d3..b2cb52e7 100644
--- a/resources/js/components/Admin/WidgetLatestRegistrations.vue
+++ b/resources/js/components/Admin/WidgetLatestRegistrations.vue
@@ -274,10 +274,6 @@ export default {
                         field: 'role',
                         sortable: true,
                     },
-                    {
-                        label: this.$t('admin_page_user.table.plan'),
-                        sortable: false,
-                    },
                     {
                         label: this.$t('admin_page_user.table.storage_used'),
                         sortable: false,
diff --git a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
index d64fd1ba..ae37368a 100644
--- a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
+++ b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
@@ -67,6 +67,11 @@
         <!--Select Payment Plans-->
         <div v-if="!isPaymentOptionPage">
             <PopupContent v-if="plans">
+
+				<InfoBox v-if="plans.data.length === 0" class="!mb-0">
+					<p>There isn't any plan yet.</p>
+				</InfoBox>
+
                 <!--Toggle yearly billing-->
                 <div v-if="hasYearlyPlans.length > 0" class="mb-2 px-5 text-right">
                     <label :class="{ 'text-gray-400': !isSelectedYearlyPlans }" class="cursor-pointer text-xs font-bold">
@@ -93,7 +98,7 @@
             <!--Actions-->
             <PopupActions>
                 <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }} </ButtonBase>
-                <ButtonBase class="w-full" :button-style="buttonStyle" @click.native="isPaymentOptionPage = true">{{ $t('Upgrade Account') }} </ButtonBase>
+                <ButtonBase class="w-full" v-if="plans.data.length !== 0" :button-style="buttonStyle" @click.native="isPaymentOptionPage = true">{{ $t('Upgrade Account') }} </ButtonBase>
             </PopupActions>
         </div>
     </PopupWrapper>
@@ -114,10 +119,12 @@ import { mapGetters } from 'vuex'
 import { events } from '../../bus'
 import axios from 'axios'
 import Spinner from '../FilesView/Spinner'
+import InfoBox from "../Others/Forms/InfoBox";
 
 export default {
     name: 'SelectPlanSubscriptionPopup',
     components: {
+		InfoBox,
         Spinner,
         PaymentMethod,
         paystack,
diff --git a/resources/js/components/Subscription/UserEmptySubscription.vue b/resources/js/components/Subscription/UserEmptySubscription.vue
index 0dc06094..0777c6fd 100644
--- a/resources/js/components/Subscription/UserEmptySubscription.vue
+++ b/resources/js/components/Subscription/UserEmptySubscription.vue
@@ -8,11 +8,11 @@
             {{ $t('Free Plan') }}
         </b>
 
-        <b class="mb-3 mb-8 block text-sm text-gray-400">
-            {{ $t('1GB Free storage space with 5 Team members') }}
+        <b v-if="$store.getters.config.allowed_payments" class="mb-3 mb-8 block text-sm text-gray-400">
+            {{ $t('Upgrade your account to get more.') }}
         </b>
 
-        <ButtonBase @click.native="$openUpgradeOptions" type="submit" button-style="theme" class="mt-4 w-full">
+        <ButtonBase v-if="$store.getters.config.allowed_payments" @click.native="$openUpgradeOptions" type="submit" button-style="theme" class="mt-4 w-full">
             {{ $t('Upgrade Your Account') }}
         </ButtonBase>
     </div>
diff --git a/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
index 72f94b4f..8c075609 100644
--- a/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
+++ b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
@@ -62,6 +62,8 @@ class StorePaymentServiceCredentialsController
             // Store credentials into the .env file
             setEnvironmentValue($credentials[$request->input('service')]);
 
+            // TODO: call plan creation
+
             // Clear cache
             if (! is_dev()) {
                 Artisan::call('cache:clear');