diff --git a/app/Http/Controllers/App/AppFunctionsController.php b/app/Http/Controllers/App/AppFunctionsController.php
index 6ffb93a7..2087d1c2 100644
--- a/app/Http/Controllers/App/AppFunctionsController.php
+++ b/app/Http/Controllers/App/AppFunctionsController.php
@@ -27,7 +27,6 @@ class AppFunctionsController extends Controller
      * @var array
      */
     private $blacklist = [
-        'contact_email',
         'purchase_code',
         'license',
     ];
diff --git a/app/Http/Controllers/App/Maintenance.php b/app/Http/Controllers/App/Maintenance.php
index ecbc6c4a..6bc28675 100644
--- a/app/Http/Controllers/App/Maintenance.php
+++ b/app/Http/Controllers/App/Maintenance.php
@@ -17,20 +17,14 @@ use Schema;
 
 class Maintenance extends Controller
 {
-    /**
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function __construct()
-    {
-        // Check admin permission
-        Gate::authorize('maintenance');
-    }
-
     /**
      *  Start maintenance mode
      */
     public function up()
     {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
         $command = Artisan::call('up');
 
         if ($command === 0) {
@@ -43,6 +37,9 @@ class Maintenance extends Controller
      */
     public function down()
     {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
         $command = Artisan::call('down');
 
         if ($command === 0) {
@@ -58,9 +55,14 @@ class Maintenance extends Controller
      */
     public function upgrade_translations()
     {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
         resolve(LanguageService::class)
             ->upgrade_language_translations();
 
+
+
         return response('Done.', 201);
     }
 
@@ -69,6 +71,9 @@ class Maintenance extends Controller
      */
     public function upgrade_database()
     {
+        // Check admin permission
+        Gate::authorize('maintenance');
+
         $command = Artisan::call('migrate', [
             '--force' => true
         ]);
diff --git a/app/Services/LanguageService.php b/app/Services/LanguageService.php
index 2bf192ff..9eead415 100644
--- a/app/Services/LanguageService.php
+++ b/app/Services/LanguageService.php
@@ -88,6 +88,9 @@ class LanguageService
             // Store translations into database
             DB::table('language_translations')
                 ->insert($translations);
+
+            // Flush cache
+            cache()->forget("language-translations-$locale");
         });
     }
 }
\ No newline at end of file
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 286c80f0..5c9a4fae 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -16,7 +16,7 @@
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=82133cc16f55222bbbe6",
     "/chunks/app-email.js": "/chunks/app-email.js?id=c578a85112c6a4b1ed0e",
     "/chunks/app-index.js": "/chunks/app-index.js?id=7f07dceace5c9c8255bb",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=72d62ca61383a8e60113",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=69066ec2d8c08efc5fb8",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/oasis/users~chunks/pages~ch~d2d9c21f.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/oasis/users~chunks/pages~ch~d2d9c21f.js?id=75adbc1ad3e9519d1f1e",
     "/chunks/app-others.js": "/chunks/app-others.js?id=9156adba3b1697a8bf3e",
     "/chunks/app-payments.js": "/chunks/app-payments.js?id=7e1a982c90174f568fb2",
@@ -46,7 +46,7 @@
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=4318b86070eea9d36bff",
     "/chunks/invoices.js": "/chunks/invoices.js?id=94f9018ed9485d79b675",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e",
-    "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=913d27b663c0605e506c",
+    "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=0521ad7d0d05df47fec7",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=70db823f851fa4e66668",
     "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=90b1c1fbbfa2116359ce",
     "/chunks/oasis/sign-up.js": "/chunks/oasis/sign-up.js?id=e53eeb48ebabae259f9c",
@@ -98,5 +98,6 @@
     "/chunks/users.js": "/chunks/users.js?id=c6da1cb3f2dce89fa4ca",
     "/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",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~f0e94b19.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~f0e94b19.js?id=d57479525cd6baaf09f3",
-    "/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"
+    "/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",
+    "/chunks/oasis/homepage.df6ee897a945b0217a61.hot-update.js": "/chunks/oasis/homepage.df6ee897a945b0217a61.hot-update.js"
 }
diff --git a/resources/js/Oasis/Homepage/Components/OasisContact.vue b/resources/js/Oasis/Homepage/Components/OasisContact.vue
index ce880a01..c0f4f2b0 100644
--- a/resources/js/Oasis/Homepage/Components/OasisContact.vue
+++ b/resources/js/Oasis/Homepage/Components/OasisContact.vue
@@ -127,7 +127,7 @@
             }
         },
         created() {
-            axios.get('/api/admin/settings?column=billing_name|billing_country|billing_city|billing_address|billing_phone_number|billing_postal_code|billing_state|billing_vat_number|contact_email')
+            axios.get('/api/content?column=billing_name|billing_country|billing_city|billing_address|billing_phone_number|billing_postal_code|billing_state|billing_vat_number|contact_email')
                 .then(response => {
                     this.data = response.data
                 })
diff --git a/resources/js/views/Admin/Languages/Language.vue b/resources/js/views/Admin/Languages/Language.vue
index da80c8e4..41eccea7 100644
--- a/resources/js/views/Admin/Languages/Language.vue
+++ b/resources/js/views/Admin/Languages/Language.vue
@@ -97,12 +97,27 @@
                         <div class="block-wrapper" v-for="(translation, key) in translationList" :key="key">
                             <label> {{ referenceTranslations[key] }}:</label>
                             <ValidationProvider tag="div" class="input-wrapper" name="Language string" rules="required" v-slot="{ errors }">
-                                <input type="text"
-                                       :class="{'is-error': errors[0]}"
-                                       class="focus-border-theme"
-                                       @input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
-                                       v-model="selectedLanguage.data.attributes.translations[key]"
+
+                                <!--Input-->
+                                <input
+                                    v-if="selectedLanguage.data.attributes.translations[key].length < 80"
+                                    type="text"
+                                    :class="{'is-error': errors[0]}"
+                                    class="focus-border-theme"
+                                    @input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
+                                    v-model="selectedLanguage.data.attributes.translations[key]"
                                 />
+
+                                <!--Textarea-->
+                                <textarea
+                                    v-if="selectedLanguage.data.attributes.translations[key].length > 80"
+                                    v-model="selectedLanguage.data.attributes.translations[key]"
+                                    @input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
+                                    rows="3"
+                                    class="focus-border-theme"
+                                    :class="{'is-error': errors[0]}"
+                                ></textarea>
+
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>