From 81f5b6a428161ba10dabc71d2eabfb194c1ec06f Mon Sep 17 00:00:00 2001
From: Emile NDAGIJIMANA <emile.ndagijimana@apitech.fr>
Date: Wed, 10 Nov 2021 16:48:47 +0100
Subject: [PATCH 1/2] Fix this bug, if OIDC button text was customized, the
 default text will be added if a user click on 'Forgot your password' and
 valid or ckick on 'Register'

---
 client/components/main/layouts.js      | 4 ++++
 client/components/sidebar/sidebar.jade | 3 +++
 i18n/en.i18n.json                      | 3 ++-
 i18n/fr.i18n.json                      | 5 +++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 984507f55..ac1872c8b 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -180,6 +180,10 @@ Template.userFormsLayout.events({
         templateInstance.isLoading.set(false);
       });
     }
+    isCheckDone= false;
+  },
+  'click #at-signUp'(event, templateInstance){
+    isCheckDone= false;
   },
   'DOMSubtreeModified #at-oidc'(event){
     if(alreadyCheck <= 2){
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 5060d94e3..f303bd980 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -109,6 +109,9 @@ template(name="boardTeamGeneral")
           b
             | {{_ 'add-teams'}}
           br
+          i.addTeamsLabelcss
+            | {{_ 'to-create-teams-contact-admin'}}
+          br
           i.addTeamsLabelcss
             | {{_ 'add-teams-label'}}
         th
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 4d24733f5..3afc8286c 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -1098,5 +1098,6 @@
   "filter-card-title-label": "Filter by card title",
   "invite-people-success": "Invitation to register sent with success",
   "invite-people-error": "Error while sending invitation to register",
-  "can-invite-if-same-mailDomainName": "Email domain name"
+  "can-invite-if-same-mailDomainName": "Email domain name",
+  "to-create-teams-contact-admin": "To create teams, please contact the administrator."
 }
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 75e9aa077..ae0f6e237 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -1097,5 +1097,6 @@
     "filter-card-title-label": "Filtrer par titre de carte",
     "invite-people-success": "Invitation to register sent with success",
     "invite-people-error": "Error while sending invitation to register",
-    "can-invite-if-same-mailDomainName": "Email domain name"
-}
\ No newline at end of file
+    "can-invite-if-same-mailDomainName": "Email domain name",
+    "to-create-teams-contact-admin": "Pour créer des équipes, veuillez contacter l'administrateur."
+}

From 2d749e13e08a565926b9e8a4bc2b7c5e72441ddc Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 11 Nov 2021 19:25:19 +0200
Subject: [PATCH 2/2] Fixed typos.

---
 client/components/main/layouts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index ac1872c8b..01a73a4d4 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -180,10 +180,10 @@ Template.userFormsLayout.events({
         templateInstance.isLoading.set(false);
       });
     }
-    isCheckDone= false;
+    isCheckDone = false;
   },
   'click #at-signUp'(event, templateInstance){
-    isCheckDone= false;
+    isCheckDone = false;
   },
   'DOMSubtreeModified #at-oidc'(event){
     if(alreadyCheck <= 2){