diff --git a/app/Client/Client.php b/app/Client/Client.php
index 722a16b..6412ea6 100644
--- a/app/Client/Client.php
+++ b/app/Client/Client.php
@@ -61,6 +61,9 @@ class Client
         if (Arr::get($parsedUrl, 'scheme') === 'https') {
             $url .= ':443';
         }
+        if (! is_null($port = Arr::get($parsedUrl, 'port'))) {
+            $url .= ":{$port}";
+        }
 
         return $url;
     }
diff --git a/app/Server/Http/Controllers/Admin/StoreSettingsController.php b/app/Server/Http/Controllers/Admin/StoreSettingsController.php
index 92b2195..1feb8e7 100644
--- a/app/Server/Http/Controllers/Admin/StoreSettingsController.php
+++ b/app/Server/Http/Controllers/Admin/StoreSettingsController.php
@@ -35,6 +35,8 @@ class StoreSettingsController extends AdminController
 
         config()->set('expose.admin.messages.subdomain_taken', Arr::get($messages, 'subdomain_taken'));
 
+        config()->set('expose.admin.maximum_connection_length', $request->get('maximum_connection_length'));
+
         config()->set('expose.admin.messages.message_of_the_day', Arr::get($messages, 'message_of_the_day'));
 
         $httpConnection->send(
diff --git a/resources/views/client/dashboard.twig b/resources/views/client/dashboard.twig
index 71ca4e3..ab1b084 100644
--- a/resources/views/client/dashboard.twig
+++ b/resources/views/client/dashboard.twig
@@ -202,21 +202,23 @@
                     <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
 
                         <span class="text-xs text-gray-600">Received at: @{ currentLog.performed_at }</span>
-                        <span
-                            v-if="currentLog.response?.status >= 200 && currentLog.response?.status < 300"
-                            class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-green-100 text-green-800">
-                                      @{ currentLog.response?.status } - @{ currentLog.response?.reason }
-                                    </span>
-                        <span
-                            v-if="currentLog.response?.status >= 400 && currentLog.response?.status < 500"
-                            class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-yellow-100 text-yellow-800">
-                                      @{ currentLog.response?.status } - @{ currentLog.response?.reason }
-                                    </span>
-                        <span
-                            v-if="currentLog.response?.status >= 500"
-                            class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-red-100 text-red-800">
-                                      @{ currentLog.response?.status } - @{ currentLog.response?.reason }
-                                    </span>
+                        <div v-if="currentLog.response">
+                            <span
+                                v-if="currentLog.response.status >= 200 && currentLog.response.status < 300"
+                                class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-green-100 text-green-800">
+                                          @{ currentLog.response.status } - @{ currentLog.response.reason }
+                                        </span>
+                            <span
+                                v-if="currentLog.response.status >= 400 && currentLog.response.status < 500"
+                                class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-yellow-100 text-yellow-800">
+                                          @{ currentLog.response.status } - @{ currentLog.response.reason }
+                                        </span>
+                            <span
+                                v-if="currentLog.response.status >= 500"
+                                class="inline-flex items-center px-3 py-0.5 rounded-full text-xs font-medium leading-5 bg-red-100 text-red-800">
+                                          @{ currentLog.response.status } - @{ currentLog.response.reason }
+                                        </span>
+                        </div>
                     </p>
                 </div>
                 <div>
diff --git a/resources/views/server/settings/index.twig b/resources/views/server/settings/index.twig
index 38c54e2..8f36d07 100644
--- a/resources/views/server/settings/index.twig
+++ b/resources/views/server/settings/index.twig
@@ -56,6 +56,22 @@
                                         </div>
                                     </div>
 
+                                    <div
+                                        class="mt-6 sm:mt-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:border-t sm:border-gray-200 sm:pt-5">
+                                        <label for="maximum_connection_length"
+                                               class="block text-sm font-medium leading-5 text-gray-700 sm:mt-px sm:pt-2">
+                                            Maximum connection length
+                                        </label>
+                                        <div class="mt-1 sm:mt-0 sm:col-span-2">
+                                            <div class="max-w-lg flex rounded-md shadow-sm">
+                                                <input type="number" id="maximum_connection_length" name="maximum_connection_length"
+                                                          v-model="configuration.maximum_connection_length"
+                                                          class="form-textarea block w-full transition duration-150 ease-in-out sm:text-sm sm:leading-5" />
+                                            </div>
+                                            <p class="mt-2 text-sm text-gray-500">The amount of minutes that clients may be connected to this expose server. 0 means there is no limit.</p>
+                                        </div>
+                                    </div>
+
                                     <div
                                         class="mt-6 sm:mt-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:items-start sm:border-t sm:border-gray-200 sm:pt-5">
                                         <label for="invalid_auth_token"