diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index f1f48d01..c136124c 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -16,6 +16,12 @@ use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the app composer.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class AppComposer
 {
     /**
diff --git a/app/Composers/CurrentUserComposer.php b/app/Composers/CurrentUserComposer.php
index 7543ad8d..b90f6272 100644
--- a/app/Composers/CurrentUserComposer.php
+++ b/app/Composers/CurrentUserComposer.php
@@ -14,6 +14,13 @@ namespace CachetHQ\Cachet\Composers;
 use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * This is the current user composer.
+ *
+ * @author Joseph Cohen <joe@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class CurrentUserComposer
 {
     /**
diff --git a/app/Composers/DashboardComposer.php b/app/Composers/DashboardComposer.php
index e36c9fd0..e30145f0 100644
--- a/app/Composers/DashboardComposer.php
+++ b/app/Composers/DashboardComposer.php
@@ -17,6 +17,12 @@ use CachetHQ\Cachet\Models\IncidentTemplate;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the dashboard composer.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class DashboardComposer
 {
     /**
diff --git a/app/Composers/ModuleComposer.php b/app/Composers/ModuleComposer.php
index f15c186d..b758401b 100644
--- a/app/Composers/ModuleComposer.php
+++ b/app/Composers/ModuleComposer.php
@@ -15,6 +15,11 @@ use CachetHQ\Cachet\Services\Modules\Manager;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the module composer.
+ *
+ * @author Connor S. Parks <connor@connorvg.tv>
+ */
 class ModuleComposer
 {
     /**
diff --git a/app/Composers/ThemeComposer.php b/app/Composers/ThemeComposer.php
index 191b8946..b4c6c07e 100644
--- a/app/Composers/ThemeComposer.php
+++ b/app/Composers/ThemeComposer.php
@@ -14,6 +14,12 @@ namespace CachetHQ\Cachet\Composers;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the theme composer.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ */
 class ThemeComposer
 {
     /**
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 52851236..5c27b0c1 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -25,6 +25,13 @@ use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\View;
 
+/**
+ * This is the setup controller.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joseph Cohen <joe@alt-three.com>
+ */
 class SetupController extends Controller
 {
     /**
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index df2db0e3..e6fd6009 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -35,7 +35,7 @@
                         <select name="env[cache_driver]" class="form-control" required>
                             <option disabled>{{ trans('forms.setup.cache_driver') }}</option>
                             @foreach($cache_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Binput::old('env.cache_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                            <option value="{{ $driver }}" {{ Binput::old('env.cache_driver') == $driver || $driver === "file" ? "selected" : null }}>{{ $driverName }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('env.cache_driver'))
@@ -47,7 +47,7 @@
                         <select name="env[session_driver]" class="form-control" required>
                             <option disabled>{{ trans('forms.setup.session_driver') }}</option>
                             @foreach($cache_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Binput::old('env.session_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                            <option value="{{ $driver }}" {{ Binput::old('env.session_driver') == $driver || $driver === "file" ? "selected" : null }}>{{ $driverName }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('env.session_driver'))
@@ -59,7 +59,7 @@
                         <select name="env[mail_driver]" class="form-control" required>
                             <option disabled>{{ trans('forms.setup.mail_driver') }}</option>
                             @foreach($mail_drivers as $driver => $driverName)
-                            <option value="{{ $driver }}" {{ Binput::old('env.mail_driver') == $driver ? "selected" : null }}>{{ $driverName }}</option>
+                            <option value="{{ $driver }}" {{ Binput::old('env.mail_driver') == $driver || $driver === "log" ? "selected" : null }}>{{ $driverName }}</option>
                             @endforeach
                         </select>
                         @if($errors->has('env.mail_driver'))