diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 027dd1f3ea..408344ebb6 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -72,6 +72,12 @@ class EmailController extends BaseController
         $user = auth()->user();
         $company = $entity_obj->company;
 
+        /** Force AEAT Submission */
+        if($company->verifactuEnabled() && $entity_obj instanceof Invoice && $entity_obj->backup->guid == "") {
+            $entity_obj->service()->sendVerifactu();
+            return $this->itemResponse($entity_obj->fresh());
+        }
+
         if ($request->cc_email && (Ninja::isSelfHost() || $user->account->isPremium())) {
 
             foreach ($request->cc_email as $email) {
diff --git a/app/Services/EDocument/Standards/Verifactu.php b/app/Services/EDocument/Standards/Verifactu.php
index 07d838a916..76720da52f 100644
--- a/app/Services/EDocument/Standards/Verifactu.php
+++ b/app/Services/EDocument/Standards/Verifactu.php
@@ -204,7 +204,7 @@ class Verifactu extends AbstractService
         $nif = $log->nif;
         $invoiceNumber = $log->invoice_number;
         $date = $log->date->format('d-m-Y');
-        $total = round($log->invoice->amount, 2);
+        $total = (string)round($log->invoice->amount, 2);
         
         $url = sprintf(
             $this->aeat_client->base_qr_url,
@@ -212,10 +212,9 @@ class Verifactu extends AbstractService
             urlencode($nif),
             urlencode($invoiceNumber),
             urlencode($date),
-            urlencode((string) $total)
+            urlencode($total)
         );
 
-
         $result = Builder::create()
             ->writer(new PngWriter())
             ->data($url)
diff --git a/config/services.php b/config/services.php
index fc524c193c..398b1b5e24 100644
--- a/config/services.php
+++ b/config/services.php
@@ -53,7 +53,7 @@ return [
     ],
 
     'microsoft' => [
-        'client_id' => env('MICROSOFT_CLIENT_ID',''),
+        'client_id' => env('MICROSOFT_CLIENT_ID',false),
         'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
         'redirect' => env('MICROSOFT_REDIRECT_URI'),
     ],
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 08116eb00e..fe63537baa 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -8,17 +8,21 @@
   <meta name="google-signin-client_id" content="{{ config('services.google.client_id') }}">
   <link rel="manifest" href="manifest.json?v={{ config('ninja.app_version') }}">
   <script src="{{ asset('js/pdf.min.js') }}"></script>
+
+  @if(config('services.microsoft.client_id'))
+    <!-- Microsoft OAuth library -->
+    <script type="text/javascript" 
+      src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
+      integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
+      crossorigin="anonymous">
+    </script>
+  @endif
+  
   @if(\App\Utils\Ninja::isHosted())
 
   <!-- Apple OAuth Library -->
   <script type="text/javascript" src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/en_US/appleid.auth.js"></script>
 
-  <!-- Microsoft OAuth library -->
-  <script type="text/javascript" 
-    src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
-    integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYtUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
-    crossorigin="anonymous">
-  </script>
 
   <!-- G Tag Manager -->
   <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':