diff --git a/app/Actions/Docker/GetContainersStatus.php b/app/Actions/Docker/GetContainersStatus.php
index f0e1de8f6..2d970560b 100644
--- a/app/Actions/Docker/GetContainersStatus.php
+++ b/app/Actions/Docker/GetContainersStatus.php
@@ -221,7 +221,19 @@ class GetContainersStatus
                 }
                 $name = data_get($exitedService, 'name');
                 $fqdn = data_get($exitedService, 'fqdn');
-                $containerName = $name ? "$name, available at $fqdn" : $fqdn;
+                if ($name) {
+                    if ($fqdn) {
+                        $containerName = "$name, available at $fqdn";
+                    } else {
+                        $containerName = $name;
+                    }
+                } else {
+                    if ($fqdn) {
+                        $containerName = $fqdn;
+                    } else {
+                        $containerName = null;
+                    }
+                }
                 $projectUuid = data_get($service, 'environment.project.uuid');
                 $serviceUuid = data_get($service, 'uuid');
                 $environmentName = data_get($service, 'environment.name');
@@ -539,7 +551,19 @@ class GetContainersStatus
             }
             $name = data_get($exitedService, 'name');
             $fqdn = data_get($exitedService, 'fqdn');
-            $containerName = $name ? "$name, available at $fqdn" : $fqdn;
+            if ($name) {
+                if ($fqdn) {
+                    $containerName = "$name, available at $fqdn";
+                } else {
+                    $containerName = $name;
+                }
+            } else {
+                if ($fqdn) {
+                    $containerName = $fqdn;
+                } else {
+                    $containerName = null;
+                }
+            }
             $projectUuid = data_get($service, 'environment.project.uuid');
             $serviceUuid = data_get($service, 'uuid');
             $environmentName = data_get($service, 'environment.name');
diff --git a/app/Livewire/ForcePasswordReset.php b/app/Livewire/ForcePasswordReset.php
index e4a66ebd6..7bbec9d32 100644
--- a/app/Livewire/ForcePasswordReset.php
+++ b/app/Livewire/ForcePasswordReset.php
@@ -24,7 +24,7 @@ class ForcePasswordReset extends Component
     }
     public function render()
     {
-        return view('livewire.force-password-reset');
+        return view('livewire.force-password-reset')->layout('layouts.simple');
     }
     public function submit()
     {