diff --git a/VERSION.txt b/VERSION.txt
index db53e5ced845..d6542901dfb1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.14
\ No newline at end of file
+5.7.16
\ No newline at end of file
diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index cd94c3ab70c2..ca8417573ce7 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -61,6 +61,8 @@ class CreateTestData extends Command
 
     protected $invoice_repo;
 
+    protected $count;
+    
     /**
      * Execute the console command.
      *
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index a32ea52c4efb..25080f33d190 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -418,10 +418,12 @@ class LoginController extends BaseController
             ->setReturnType(Model\User::class)
             ->execute();
 
+            nlog($user);
+
         if ($user) {
             $account = request()->input('account');
 
-            $email = $user->getMail() ?: $user->getUserPrincipalName();
+            $email = $user->getUserPrincipalName() ?: $user->getMail();
 
             $query = [
                 'oauth_user_id' => $user->getId(),
@@ -437,15 +439,15 @@ class LoginController extends BaseController
             }
 
             //If this is a result user/email combo - lets add their OAuth details details
-            if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
-                if (!$existing_login_user->account) {
-                    return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
-                }
+            // if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
+            //     if (!$existing_login_user->account) {
+            //         return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+            //     }
 
-                Auth::login($existing_login_user, true);
+            //     Auth::login($existing_login_user, true);
 
-                return $this->existingLoginUser($user->getId(), 'microsoft');
-            }
+            //     return $this->existingLoginUser($user->getId(), 'microsoft');
+            // }
 
 
             // Signup!
diff --git a/config/ninja.php b/config/ninja.php
index 1f9ecb8e6d1d..3fee705c8da1 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -15,8 +15,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.14'),
-    'app_tag' => env('APP_TAG','5.7.14'),
+    'app_version' => env('APP_VERSION','5.7.16'),
+    'app_tag' => env('APP_TAG','5.7.16'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
diff --git a/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php b/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php
index f79a5d206773..4f7d153760df 100644
--- a/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/documents-table.blade.php
@@ -94,8 +94,8 @@
                             <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
                                 <input type="checkbox" class="form-checkbox cursor-pointer" onchange="appendToElement('multiple-downloads', '{{ $document->hashed_id }}')" />
                             </td>
-                            <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                                {{ Illuminate\Support\Str::limit($document->name, 40) }}
+                            <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500 truncate">
+                                {{ $document->name }}
                             </td>
 
                             <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">