diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 155d961a247c..d81d98629faf 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -122,6 +122,9 @@ class PreviewController extends BaseController
                 ->design($design)
                 ->build();
 
+            if(request()->has('html') && request()->input('html') == true)
+                return $maker->getCompiledHTML;
+
             //if phantom js...... inject here..
             if (config('ninja.phantomjs_pdf_generation')) {
                 return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index 555ed82ea014..e2b5aa3ff2ee 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -35,9 +35,12 @@ class StoreExpenseRequest extends Request
     {
         $rules = [];
 
-        $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
+        if (isset($this->number)) {
+            $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
+        }
+        
         // $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
-        $rules['contacts.*.email'] = 'nullable|distinct';
+        // $rules['contacts.*.email'] = 'nullable|distinct';
         //$rules['number'] = new UniqueExpenseNumberRule($this->all());
         $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
 
@@ -55,6 +58,10 @@ class StoreExpenseRequest extends Request
             $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
         }
 
+        if (! array_key_exists('currency_id', $input)) {
+            $input['currency_id'] = auth()->user()->company()->settings->currency_id;
+        }
+
         $this->replace($input);
     }
 
@@ -62,8 +69,6 @@ class StoreExpenseRequest extends Request
     {
         return [
             'unique' => ctrans('validation.unique', ['attribute' => 'email']),
-            //'required' => trans('validation.required', ['attribute' => 'email']),
-            'contacts.*.email.required' => ctrans('validation.email', ['attribute' => 'email']),
         ];
     }
 }
diff --git a/app/Http/Requests/Project/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php
index a7f77e9d2c67..ec50b314c70e 100644
--- a/app/Http/Requests/Project/StoreProjectRequest.php
+++ b/app/Http/Requests/Project/StoreProjectRequest.php
@@ -15,6 +15,7 @@ use App\Http\Requests\Request;
 use App\Models\Client;
 use App\Models\Project;
 use App\Utils\Traits\MakesHash;
+use Illuminate\Validation\Rule;
 
 class StoreProjectRequest extends Request
 {
@@ -36,7 +37,10 @@ class StoreProjectRequest extends Request
 
         $rules['name'] = 'required';
         $rules['client_id'] = 'required|exists:clients,id,company_id,'.auth()->user()->company()->id;
-        $rules['number'] = 'unique:projects,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
+
+        if (isset($this->number)) {
+            $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id);
+        }
 
         return $this->globalRules($rules);
     }