diff --git a/app/Http/Controllers/Install/Settings.php b/app/Http/Controllers/Install/Settings.php
index f7ca21457..3966d9b87 100644
--- a/app/Http/Controllers/Install/Settings.php
+++ b/app/Http/Controllers/Install/Settings.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Install;
 
 use App\Http\Requests\Install\Setting as Request;
+use App\Http\Requests\Install\Setting;
 use App\Utilities\Installer;
 use Illuminate\Routing\Controller;
 
@@ -21,11 +22,11 @@ class Settings extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  Request  $request
+     * @param  Setting  $request
      *
      * @return Response
      */
-    public function store(Request $request)
+    public function store(Setting $request)
     {
         // Create company
         Installer::createCompany($request->get('company_name'), $request->get('company_email'), session('locale'));
diff --git a/app/Http/Requests/Install/Setting.php b/app/Http/Requests/Install/Setting.php
index 95f282ec4..4719868b6 100644
--- a/app/Http/Requests/Install/Setting.php
+++ b/app/Http/Requests/Install/Setting.php
@@ -25,8 +25,8 @@ class Setting extends FormRequest
     {
         return [
             'company_name' => 'required',
-            'company_email' => 'required',
-            'user_email' => 'required',
+            'company_email' => 'required|email',
+            'user_email' => 'required|email',
             'user_password' => 'required'
         ];
     }