diff --git a/app/Http/Requests/Setting/Setting.php b/app/Http/Requests/Setting/Setting.php
index 2dc2707d5..ce8cbd1da 100644
--- a/app/Http/Requests/Setting/Setting.php
+++ b/app/Http/Requests/Setting/Setting.php
@@ -23,10 +23,20 @@ class Setting extends FormRequest
      */
     public function rules()
     {
+        $name = 'nullable';
+        $email = 'nullable';
+        $logo = 'nullable';
+
+        if ($this->request->get('_prefix', null) == 'company') {
+            $name = 'required|string';
+            $email = 'required|email';
+            $logo = 'mimes:' . config('filesystems.mimes', 'pdf,jpeg,jpg,png');
+        }
+
         return [
-            //'company_name' => 'required|string',
-            //'company_email' => 'required|email',
-            //'company_logo' => 'mimes:' . config('filesystems.mimes'), 'pdf,jpeg,jpg,png'),
+            'name' => $name,
+            'email' => $email,
+            'logo' => $logo,
         ];
     }
 }
diff --git a/resources/views/settings/company/edit.blade.php b/resources/views/settings/company/edit.blade.php
index e525edf3c..1a44d3e01 100644
--- a/resources/views/settings/company/edit.blade.php
+++ b/resources/views/settings/company/edit.blade.php
@@ -28,7 +28,7 @@
 
                 {{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }}
 
-                {{ Form::fileGroup('logo', trans('settings.company.logo'), 'file-image-o', ['dropzone-class' => 'form-file', 'options' => ['acceptedFiles' => 'image/*']], setting('company.logo')) }}
+                {{ Form::fileGroup('logo', trans('settings.company.logo'), 'file-image-o', ['options' => ['acceptedFiles' => 'image/*']], setting('company.logo')) }}
             </div>
         </div>