diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a414d32b..e3a97b35 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0']
+        php-versions: ['8.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -20,7 +20,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.1'
         coverage: 'xdebug'
 
     - name: Copy .env
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
index c475100d..310fe218 100644
--- a/.phpunit.cache/test-results
+++ b/.phpunit.cache/test-results
@@ -1 +1 @@
-{"version":1,"defects":{"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testCreate":5,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testIndex":5,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testDestroy":5,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testFileUpload":8,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testCreateSubsciption":1,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testUpdatePaymentMethod":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingSubscribe":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingGetDetails":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingPaymentMethod":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingCoupon":1,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testTwoFactorEmail":7,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testGoogleTwoFactor":5,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testGetTwoFactorPage":5,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testVerifyTwoFactorEmail":7,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testCreate":7,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testIndex":5,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testDestroy":5,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testAuthenticatorTwoFactor":7,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testPostRegistration":7,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testVerifyRecovery":7,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testImageUpload":7,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testLeaveTeam":5,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testRemoveTeamMember":5,"Tests\\Feature\\Controllers\\TeamsControllerTest::testDelete":5,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testAccept":7},"times":{"Tests\\Unit\\ActivityServiceTest::testLog":0.005,"Tests\\Unit\\InviteServiceTest::testCreate":0.012,"Tests\\Unit\\InviteServiceTest::testValidateInvitation":0.003,"Tests\\Unit\\TeamServiceTest::testCreate":0.001,"Tests\\Unit\\TeamServiceTest::testUpdate":0.002,"Tests\\Unit\\TeamServiceTest::testInvite":0.003,"Tests\\Unit\\TeamServiceTest::testLeaveTeam":0.004,"Tests\\Unit\\TeamServiceTest::testRemoveMember":0.004,"Tests\\Unit\\TeamServiceTest::testDeleteTeam":0.004,"Tests\\Feature\\Controllers\\Admin\\DashboardControllerTest::testIndex":0.081,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testIndex":0.035,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testCreate":0.033,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testStore":0.012,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testEdit":0.036,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testUpdate":0.007,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testDelete":0.006,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testIndex":0.037,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testSearch":0.047,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testGetInvite":0.033,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testPostInvite":0.098,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testEdit":0.037,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testUpdate":0.007,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testLoginAsUser":0.007,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testReturnToLoginFromUser":0.011,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testDelete":0.006,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testCreate":0.008,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testIndex":0.001,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testDestroy":0.001,"Tests\\Feature\\Controllers\\Ajax\\CookiePolicyControllerTest::testAccept":0.005,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testFileUpload":0.017,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testCreateSubsciption":0.003,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testUpdatePaymentMethod":0.001,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testMe":0.031,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testMeWithBearerToken":0.011,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testUpdate":0.008,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testDestroy":0.004,"Tests\\Feature\\Controllers\\Auth\\ConfirmsPasswordControllerTest::testGetConfirmPasswordPage":0.027,"Tests\\Feature\\Controllers\\Auth\\ForgotPasswordControllerTest::testGetForgotPassword":0.016,"Tests\\Feature\\Controllers\\Auth\\LoginControllerTest::testGetLoginPage":0.019,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testGetRegistration":0.018,"Tests\\Feature\\Controllers\\Auth\\ResetPasswordControllerTest::testGetResetPasswordPage":0.015,"Tests\\Feature\\Controllers\\Auth\\VerificationControllerTest::testGetVerificationPage":0.005,"Tests\\Feature\\Controllers\\DashboardControllerTest::testDashboard":0.036,"Tests\\Feature\\Controllers\\InvitesControllerTest::testResend":0.006,"Tests\\Feature\\Controllers\\InvitesControllerTest::testRevoke":0.007,"Tests\\Feature\\Controllers\\PagesControllerTest::testHome":0.018,"Tests\\Feature\\Controllers\\PagesControllerTest::testSupport":0.027,"Tests\\Feature\\Controllers\\PagesControllerTest::testPrivacyPolicy":0.025,"Tests\\Feature\\Controllers\\PagesControllerTest::testTermsOfService":0.025,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testShow":0.043,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testEditMember":0.037,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testUpdateMember":0.012,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testInviteMember":0.012,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testLeaveTeam":0.008,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testRemoveTeamMember":0.008,"Tests\\Feature\\Controllers\\TeamsControllerTest::testIndex":0.03,"Tests\\Feature\\Controllers\\TeamsControllerTest::testIndexWithSubcription":0.03,"Tests\\Feature\\Controllers\\TeamsControllerTest::testCreate":0.03,"Tests\\Feature\\Controllers\\TeamsControllerTest::testStore":0.008,"Tests\\Feature\\Controllers\\TeamsControllerTest::testEdit":0.038,"Tests\\Feature\\Controllers\\TeamsControllerTest::testUpdate":0.01,"Tests\\Feature\\Controllers\\TeamsControllerTest::testDelete":0.011,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingSubscribe":0.002,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingGetDetails":0.001,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingPaymentMethod":0.001,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingCoupon":0.001,"Tests\\Feature\\Controllers\\User\\ChangePasswordControllerTest::testSecurity":0.03,"Tests\\Feature\\Controllers\\User\\ChangePasswordControllerTest::testUpdatePassword":0.146,"Tests\\Feature\\Controllers\\User\\DestroyControllerTest::testDestroy":0.044,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testIndex":0.029,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testAccept":0.009,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testReject":0.047,"Tests\\Feature\\Controllers\\User\\LogoutSessionsControllerTest::testSessionLogout":0.009,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testIndex":0.028,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testMarkAsRead":0.008,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testDelete":0.007,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testDeleteAll":0.008,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testSettings":0.037,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testUpdateSettings":0.009,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testUpdateUserAvatar":0.01,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testTwoFactorEmail":0.01,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testGoogleTwoFactor":0,"Tests\\Feature\\Helpers\\ActivityHelperTest::testActivityLog":0.001,"Tests\\Feature\\Helpers\\NotificationHelperTest::testAppNotify":0,"Tests\\Feature\\Helpers\\NotificationHelperTest::testEmailNotifyDisabled":0.001,"Tests\\Feature\\Helpers\\NotificationHelperTest::testPusherGeneral":0.002,"Tests\\Feature\\Helpers\\NotificationHelperTest::testPusherUser":0.001,"Tests\\Feature\\Resources\\UserResourceTest::testUserResource":0,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testGetTwoFactorPage":0.02,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testVerifyTwoFactorEmail":0.008,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testGetRecoveryPage":0.019,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testCreate":0.007,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testIndex":0.052,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testDestroy":0.014,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testAuthenticatorTwoFactor":0.01,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testPostRegistration":0.013,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testVerifyRecovery":0.013,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testImageUpload":0.005}}
\ No newline at end of file
+{"version":1,"defects":{"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testCreate":5,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testIndex":5,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testDestroy":5,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testFileUpload":8,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testCreateSubsciption":1,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testUpdatePaymentMethod":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingSubscribe":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingGetDetails":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingPaymentMethod":1,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingCoupon":1,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testTwoFactorEmail":7,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testGoogleTwoFactor":5,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testGetTwoFactorPage":5,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testVerifyTwoFactorEmail":7,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testCreate":7,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testIndex":5,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testDestroy":5,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testAuthenticatorTwoFactor":7,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testPostRegistration":7,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testVerifyRecovery":7,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testImageUpload":7,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testLeaveTeam":5,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testRemoveTeamMember":5,"Tests\\Feature\\Controllers\\TeamsControllerTest::testDelete":5,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testAccept":7},"times":{"Tests\\Unit\\ActivityServiceTest::testLog":0.006,"Tests\\Unit\\InviteServiceTest::testCreate":0.013,"Tests\\Unit\\InviteServiceTest::testValidateInvitation":0.003,"Tests\\Unit\\TeamServiceTest::testCreate":0.001,"Tests\\Unit\\TeamServiceTest::testUpdate":0.002,"Tests\\Unit\\TeamServiceTest::testInvite":0.004,"Tests\\Unit\\TeamServiceTest::testLeaveTeam":0.004,"Tests\\Unit\\TeamServiceTest::testRemoveMember":0.004,"Tests\\Unit\\TeamServiceTest::testDeleteTeam":0.005,"Tests\\Feature\\Controllers\\Admin\\DashboardControllerTest::testIndex":0.08,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testIndex":0.036,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testCreate":0.037,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testStore":0.012,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testEdit":0.037,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testUpdate":0.006,"Tests\\Feature\\Controllers\\Admin\\RoleControllerTest::testDelete":0.006,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testIndex":0.038,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testSearch":0.036,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testGetInvite":0.033,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testPostInvite":0.086,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testEdit":0.041,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testUpdate":0.007,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testLoginAsUser":0.008,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testReturnToLoginFromUser":0.011,"Tests\\Feature\\Controllers\\Admin\\UserControllerTest::testDelete":0.006,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testCreate":0.008,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testIndex":0.001,"Tests\\Feature\\Controllers\\Ajax\\ApiTokenControllerTest::testDestroy":0.001,"Tests\\Feature\\Controllers\\Ajax\\CookiePolicyControllerTest::testAccept":0.006,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testFileUpload":0.017,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testCreateSubsciption":0.003,"Tests\\Feature\\Controllers\\Ajax\\SubscriptionControllerTest::testUpdatePaymentMethod":0.001,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testMe":0.03,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testMeWithBearerToken":0.011,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testUpdate":0.008,"Tests\\Feature\\Controllers\\Api\\UsersControllerTest::testDestroy":0.005,"Tests\\Feature\\Controllers\\Auth\\ConfirmsPasswordControllerTest::testGetConfirmPasswordPage":0.032,"Tests\\Feature\\Controllers\\Auth\\ForgotPasswordControllerTest::testGetForgotPassword":0.02,"Tests\\Feature\\Controllers\\Auth\\LoginControllerTest::testGetLoginPage":0.02,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testGetRegistration":0.018,"Tests\\Feature\\Controllers\\Auth\\ResetPasswordControllerTest::testGetResetPasswordPage":0.015,"Tests\\Feature\\Controllers\\Auth\\VerificationControllerTest::testGetVerificationPage":0.005,"Tests\\Feature\\Controllers\\DashboardControllerTest::testDashboard":0.038,"Tests\\Feature\\Controllers\\InvitesControllerTest::testResend":0.006,"Tests\\Feature\\Controllers\\InvitesControllerTest::testRevoke":0.006,"Tests\\Feature\\Controllers\\PagesControllerTest::testHome":0.018,"Tests\\Feature\\Controllers\\PagesControllerTest::testSupport":0.028,"Tests\\Feature\\Controllers\\PagesControllerTest::testPrivacyPolicy":0.028,"Tests\\Feature\\Controllers\\PagesControllerTest::testTermsOfService":0.028,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testShow":0.048,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testEditMember":0.039,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testUpdateMember":0.012,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testInviteMember":0.008,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testLeaveTeam":0.008,"Tests\\Feature\\Controllers\\TeamMembersControllerTest::testRemoveTeamMember":0.008,"Tests\\Feature\\Controllers\\TeamsControllerTest::testIndex":0.03,"Tests\\Feature\\Controllers\\TeamsControllerTest::testIndexWithSubcription":0.031,"Tests\\Feature\\Controllers\\TeamsControllerTest::testCreate":0.035,"Tests\\Feature\\Controllers\\TeamsControllerTest::testStore":0.008,"Tests\\Feature\\Controllers\\TeamsControllerTest::testEdit":0.038,"Tests\\Feature\\Controllers\\TeamsControllerTest::testUpdate":0.009,"Tests\\Feature\\Controllers\\TeamsControllerTest::testDelete":0.01,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingSubscribe":0.002,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingGetDetails":0.001,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingPaymentMethod":0.001,"Tests\\Feature\\Controllers\\User\\BillingControllerTest::testBillingCoupon":0.001,"Tests\\Feature\\Controllers\\User\\ChangePasswordControllerTest::testSecurity":0.036,"Tests\\Feature\\Controllers\\User\\ChangePasswordControllerTest::testUpdatePassword":0.216,"Tests\\Feature\\Controllers\\User\\DestroyControllerTest::testDestroy":0.043,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testIndex":0.032,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testAccept":0.009,"Tests\\Feature\\Controllers\\User\\InvitesControllerTest::testReject":0.047,"Tests\\Feature\\Controllers\\User\\LogoutSessionsControllerTest::testSessionLogout":0.009,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testIndex":0.032,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testMarkAsRead":0.008,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testDelete":0.006,"Tests\\Feature\\Controllers\\User\\NotificationControllerTest::testDeleteAll":0.007,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testSettings":0.039,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testUpdateSettings":0.009,"Tests\\Feature\\Controllers\\User\\SettingsControllerTest::testUpdateUserAvatar":0.009,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testTwoFactorEmail":0.009,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testGoogleTwoFactor":0,"Tests\\Feature\\Helpers\\ActivityHelperTest::testActivityLog":0.001,"Tests\\Feature\\Helpers\\NotificationHelperTest::testAppNotify":0,"Tests\\Feature\\Helpers\\NotificationHelperTest::testEmailNotifyDisabled":0.002,"Tests\\Feature\\Helpers\\NotificationHelperTest::testPusherGeneral":0.002,"Tests\\Feature\\Helpers\\NotificationHelperTest::testPusherUser":0.002,"Tests\\Feature\\Resources\\UserResourceTest::testUserResource":0,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testGetTwoFactorPage":0.021,"Tests\\Feature\\Controllers\\Auth\\TwoFactorControllerTest::testVerifyTwoFactorEmail":0.008,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testGetRecoveryPage":0.02,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testCreate":0.007,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testIndex":0.045,"Tests\\Feature\\Controllers\\User\\ApiTokenControllerTest::testDestroy":0.012,"Tests\\Feature\\Controllers\\User\\UserTwoFactorTest::testAuthenticatorTwoFactor":0.01,"Tests\\Feature\\Controllers\\Auth\\RegistrationControllerTest::testPostRegistration":0.012,"Tests\\Feature\\Controllers\\Auth\\RecoveryControllerTest::testVerifyRecovery":0.012,"Tests\\Feature\\Controllers\\Ajax\\FileUploadControllerTest::testImageUpload":0.006}}
\ No newline at end of file
diff --git a/app/View/Components/Global/ConfirmationModal.php b/app/View/Components/Global/ConfirmationModal.php
index ae922fb5..5f19bd67 100644
--- a/app/View/Components/Global/ConfirmationModal.php
+++ b/app/View/Components/Global/ConfirmationModal.php
@@ -55,6 +55,11 @@ public static function js()
                 let _target = event.target;
                 _event.preventDefault();
 
+                document.querySelectorAll('.modal').forEach(function (_instance) {
+                    let _modal = window.bootstrap.Modal.getOrCreateInstance(_instance);
+                    _modal.hide();
+                });
+
                 if (! _target.hasAttribute('data-formsjs-confirm-message')) {
                     _target = _target.closest('button');
                 }
diff --git a/readme.md b/readme.md
index 1559f299..a4fa5d85 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 ![Grafite Scaffold](https://docs.grafite.ca/img/grafite_scaffold.png)
 
-[![Laravel Tests](https://github.com/grafiteinc/scaffold/workflows/Laravel%20Tests/badge.svg)](https://github.com/grafiteinc/scaffold/actions?query=workflow%3A%22Laravel+Tests%22)
+[![Laravel Tests](https://github.com/grafiteinc/scaffold/workflows/Laravel%20Tests/badge.svg)](https://github.com/grafiteinc/scaffold/actions?query=workflow%3A%22Tests%22)
 [![Maintainability](https://api.codeclimate.com/v1/badges/8c00a046fec32d8b8ac7/maintainability)](https://codeclimate.com/github/GrafiteInc/scaffold/maintainability)
 [![Packagist](https://img.shields.io/packagist/dt/grafite/scaffold.svg)](https://packagist.org/packages/grafite/scaffold)
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg)](https://packagist.org/packages/grafite/scaffold)