diff --git a/app/Http/Requests/Wizard/Company.php b/app/Http/Requests/Wizard/Company.php
index c2d708fc8..8138313d5 100644
--- a/app/Http/Requests/Wizard/Company.php
+++ b/app/Http/Requests/Wizard/Company.php
@@ -42,8 +42,8 @@ class Company extends Request
             'company_logo' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
         ];
 
-        if (!setting('general.api_token', false)) {
-            $rules['api_token'] = 'required|string|check';
+        if (!setting('general.api_token', false) && !empty($this->request->get('api_token'))) {
+            $rules['api_token'] = 'string|check';
         }
 
         return $rules;
diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php
index e1d9805d5..b86f8a645 100644
--- a/resources/views/wizard/companies/edit.blade.php
+++ b/resources/views/wizard/companies/edit.blade.php
@@ -41,11 +41,11 @@
 
     <div class="box-body">
         <div class="col-md-12 {!! (!setting('general.api_token', null)) ?: 'hidden' !!}">
-            <div class="form-group required {{ $errors->has('api_token') ? 'has-error' : ''}}">
+            <div class="form-group {{ $errors->has('api_token') ? 'has-error' : ''}}">
                 {!! Form::label('sale_price', trans('modules.api_token'), ['class' => 'control-label']) !!}
                 <div class="input-group">
                     <span class="input-group-addon"><i class="fa fa-key"></i></span>
-                    {!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!}
+                    {!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!}
                 </div>
                 {!! $errors->first('api_token', '<p class="help-block">:message</p>') !!}
             </div>