diff --git a/client/resources/stylesheet.qss b/client/resources/stylesheet.qss
index 279a0d71..ca5e08d3 100644
--- a/client/resources/stylesheet.qss
+++ b/client/resources/stylesheet.qss
@@ -286,21 +286,21 @@ QTreeWidget::branch:open:has-children:has-siblings   {
 /*
     QLineEdit
 */
-QLineEdit, QSpinBox, QTextEdit, QDateTimeEdit, QTimeEdit{
+QLineEdit, QSpinBox, QTextEdit, QDateTimeEdit, QTimeEdit, QDateEdit{
     background-color: rgba(255,255,255,70%);
     color:black;
     min-height: 25px;
     padding-left: 5px;
 }
 
-QLineEdit:!enabled, QSpinBox:!enabled, QTextEdit:!enabled, QDateTimeEdit:!enabled, QTimeEdit:!enabled{
+QLineEdit:!enabled, QSpinBox:!enabled, QTextEdit:!enabled, QDateTimeEdit:!enabled, QTimeEdit:!enabled, QDateEdit:!enabled{
     background-color: rgba(0,0,0,0%);
     color:rgba(255,255,255,80%);
     padding-left: 0px;
 }
 
 
-QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled {
+QDateTimeEdit::down-arrow:!enabled, QDateTimeEdit::up-arrow:!enabled, QDateEdit::down-arrow:!enabled, QDateEdit::up-arrow:!enabled {
     image: none;
 }
 
diff --git a/client/src/dialogs/TestInvitationDialog.cpp b/client/src/dialogs/TestInvitationDialog.cpp
index 155f27a5..37e7de5e 100644
--- a/client/src/dialogs/TestInvitationDialog.cpp
+++ b/client/src/dialogs/TestInvitationDialog.cpp
@@ -16,11 +16,25 @@ TestInvitationDialog::~TestInvitationDialog()
     delete ui;
 }
 
+void TestInvitationDialog::setTestTypes(const QList<TeraData> &test_types)
+{
+    ui->cmbTestType->clear();
+
+    for (TeraData tt: test_types){
+        ui->cmbTestType->addItem(tt.getName(), tt.getId());
+    }
+}
+
 void TestInvitationDialog::initUI()
 {
     ui->stackedPages->setCurrentIndex(0);
     ui->btnPrevious->setEnabled(false);
     ui->btnOK->setEnabled(false);
+
+    ui->dateExpiration->setDate(QDate::currentDate().addDays(30));
+
+    ui->widgetInvitees->setCountLimited(false);
+
 }
 
 void TestInvitationDialog::on_btnCancel_clicked()
diff --git a/client/src/dialogs/TestInvitationDialog.h b/client/src/dialogs/TestInvitationDialog.h
index 1cc1c22a..607799c4 100644
--- a/client/src/dialogs/TestInvitationDialog.h
+++ b/client/src/dialogs/TestInvitationDialog.h
@@ -2,6 +2,7 @@
 #define TESTINVITATIONDIALOG_H
 
 #include <QDialog>
+#include "TeraData.h"
 
 namespace Ui {
 class TestInvitationDialog;
@@ -15,15 +16,15 @@ class TestInvitationDialog : public QDialog
     explicit TestInvitationDialog(QWidget *parent = nullptr);
     ~TestInvitationDialog();
 
+    void setTestTypes(const QList<TeraData>& test_types);
+
 private slots:
     void on_btnCancel_clicked();
 
     void on_stackedPages_currentChanged(int current_index);
 
     void on_btnPrevious_clicked();
-
     void on_btnNext_clicked();
-
     void on_btnOK_clicked();
 
 private:
diff --git a/client/src/dialogs/TestInvitationDialog.ui b/client/src/dialogs/TestInvitationDialog.ui
index 1772dea7..ae067cde 100644
--- a/client/src/dialogs/TestInvitationDialog.ui
+++ b/client/src/dialogs/TestInvitationDialog.ui
@@ -17,6 +17,9 @@
    <iconset resource="../../resources/TeraClient.qrc">
     <normaloff>:/icons/test.png</normaloff>:/icons/test.png</iconset>
   </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QStackedWidget" name="stackedPages">
@@ -27,11 +30,11 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="pageTestType">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="2" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="lblMaxUsage">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -45,34 +48,55 @@
           </font>
          </property>
          <property name="text">
-          <string>Usage maximal</string>
+          <string>Usage maximal (0 = illimité)</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QSpinBox" name="spinBox">
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="numUsage">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>30</height>
+           <height>0</height>
           </size>
          </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
+         </property>
+         <property name="maximum">
+          <number>1000</number>
+         </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QDateEdit" name="dateEdit">
+       <item row="2" column="1">
+        <widget class="QDateEdit" name="dateExpiration">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="minimumSize">
           <size>
            <width>0</width>
-           <height>30</height>
+           <height>0</height>
           </size>
          </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
+         </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="3" column="1">
         <widget class="QCheckBox" name="chkInviteEmail">
          <property name="text">
           <string>Envoyer les invitations automatiquement par courriel</string>
@@ -113,7 +137,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="lblExpiration">
          <property name="font">
           <font>
@@ -128,23 +152,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QPlainTextEdit" name="txtDescription">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="undoRedoEnabled">
-          <bool>false</bool>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
+       <item row="4" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Orientation::Vertical</enum>
@@ -162,7 +170,7 @@
      <widget class="QWidget" name="pageTargets">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
-        <widget class="SessionInviteWidget" name="widget" native="true"/>
+        <widget class="SessionInviteWidget" name="widgetInvitees" native="true"/>
        </item>
       </layout>
      </widget>
diff --git a/client/src/editors/ProjectWidget.cpp b/client/src/editors/ProjectWidget.cpp
index c68f352e..cb187899 100644
--- a/client/src/editors/ProjectWidget.cpp
+++ b/client/src/editors/ProjectWidget.cpp
@@ -52,6 +52,7 @@ ProjectWidget::ProjectWidget(ComManager *comMan, const TeraData *data, QWidget *
 
     if (!dataIsNew()){
         queryServicesProject();
+        queryTestTypesProject();
     }
 
 }
@@ -135,6 +136,7 @@ void ProjectWidget::connectSignals()
 void ProjectWidget::initUI()
 {
     ui->wdgInvitations->setComManager(m_comManager);
+    ui->tabNav->setTabVisible(ui->tabNav->indexOf(ui->tabInvitations), false);
 
     // Default display
     ui->tabNav->setCurrentIndex(0);
@@ -510,6 +512,7 @@ void ProjectWidget::updateParticipant(const TeraData *participant)
         item_last_online = new TableDateWidgetItem();
         item_last_online->setTextAlignment(Qt::AlignCenter);
         ui->tableSummary->setItem(current_row, 5, item_last_online);
+
     }
 
     // Set current values
@@ -713,6 +716,24 @@ void ProjectWidget::queryUsers()
     queryDataRequest(WEB_PROJECTACCESS_PATH, args);
 }
 
+void ProjectWidget::refreshSelectedTestTypes()
+{
+    QList<TeraData> test_types;
+    for (int i=0; i<ui->lstTestTypes->count(); i++){
+        QListWidgetItem* item = ui->lstTestTypes->item(i);
+        if (item->checkState() == Qt::Checked){
+            TeraData tt(TeraDataTypes::TERADATA_TESTTYPE);
+            tt.setName(item->text());
+            int id_test_type = m_listTestTypes_items.key(item);
+            tt.setId(id_test_type);
+            test_types.append(tt);
+        }
+    }
+
+    ui->tabNav->setTabVisible(ui->tabNav->indexOf(ui->tabInvitations), !test_types.isEmpty());
+    ui->wdgInvitations->setCurrentTestTypes(test_types);
+}
+
 void ProjectWidget::processFormsReply(QString form_type, QString data)
 {
     if (form_type == WEB_FORMS_QUERY_PROJECT){
@@ -760,7 +781,6 @@ void ProjectWidget::processParticipantsReply(QList<TeraData> participants, QUrlQ
     // Only update state for now...
     for (int i=0; i<participants.count(); i++){
         updateParticipant(&participants.at(i));
-
     }
 }
 
@@ -886,6 +906,7 @@ void ProjectWidget::processTestTypeProjectReply(QList<TeraData> ttp_list, QUrlQu
             }
         }
     }
+    refreshSelectedTestTypes();
 }
 
 void ProjectWidget::processTestTypeSiteReply(QList<TeraData> tts_list, QUrlQuery reply_query)
diff --git a/client/src/editors/ProjectWidget.h b/client/src/editors/ProjectWidget.h
index ecd8d2fd..5956f58d 100644
--- a/client/src/editors/ProjectWidget.h
+++ b/client/src/editors/ProjectWidget.h
@@ -77,9 +77,11 @@ private slots:
 
     QHash<int, QTableWidgetItem*>   m_tableUsers_items;
     QMap<int,  QTableWidgetItem*>   m_tableUserGroups_items;
-    QHash<int, QTableWidgetItem*>   m_tableParticipants_items;
     QHash<int, QListWidgetItem*>    m_listGroups_items;
 
+    QHash<int, QTableWidgetItem*>   m_tableParticipants_items;
+    QHash<int, TeraData>            m_participants;
+
     QHash<int, QTreeWidgetItem*>    m_treeDevices_items;
     QHash<int, QTreeWidgetItem*>    m_treeDevicesProjects_items;
 
@@ -119,6 +121,8 @@ private slots:
     void queryUserGroupsProjectAccess();
     void queryUsers();
 
+    void refreshSelectedTestTypes();
+
     void addServiceTab(const TeraData& service_project);
 
     void updateControlsState() override;
diff --git a/client/src/main.cpp b/client/src/main.cpp
index 055de173..22e80f3f 100755
--- a/client/src/main.cpp
+++ b/client/src/main.cpp
@@ -20,8 +20,8 @@ int main(int argc, char* argv[])
     ClientApp app(argc, argv);
 
 //Set application style
-#ifndef WIN32 // Don't set style on Windows - it creates some issues with combobox look.
-    //app->setStyle("windows");
+#ifdef WIN32
+    app.setStyle("windows"); // Force use of "windows" style, not windows 11 one if on that OS, since it has some issues right now
 #endif
 
     //WebEngine default Settings
@@ -29,6 +29,6 @@ int main(int argc, char* argv[])
     //QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
     //QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
     int rval = app.exec();
-    qDebug() << "Bye!";
+    //qDebug() << "Bye!";
     return rval;
 }
diff --git a/client/src/widgets/SessionInviteWidget.cpp b/client/src/widgets/SessionInviteWidget.cpp
index 58c4018f..cf128f18 100644
--- a/client/src/widgets/SessionInviteWidget.cpp
+++ b/client/src/widgets/SessionInviteWidget.cpp
@@ -393,6 +393,12 @@ bool SessionInviteWidget::isEditable() const
     return m_editable;
 }
 
+void SessionInviteWidget::setCountLimited(const bool &count_limited)
+{
+    m_countLimited = count_limited;
+    ui->frameCount->setVisible(m_countLimited);
+}
+
 QList<TeraData> SessionInviteWidget::getParticipantsInSession()
 {
     QList<TeraData> rval;
@@ -929,7 +935,7 @@ void SessionInviteWidget::setSearching(const bool &search)
 void SessionInviteWidget::on_btnInvite_clicked()
 {
     // Check if we are under the allowed maximum number of invitees in a session
-    if (getInviteesCount() + ui->lstInvitables->selectedItems().count() > MAX_INVITEES_IN_SESSION){
+    if (getInviteesCount() + ui->lstInvitables->selectedItems().count() > MAX_INVITEES_IN_SESSION && m_countLimited){
         GlobalMessageBox msgbox;
         msgbox.showError(tr("Nombre maximal d'invités atteint"), tr("Impossible d'ajouter ces invités à la séance: le nombre maximal de participants (") + QString::number(MAX_INVITEES_IN_SESSION) + ") " + tr("serait dépassé"));
         return;
@@ -995,7 +1001,7 @@ void SessionInviteWidget::on_treeInvitees_itemDoubleClicked(QTreeWidgetItem *ite
 {
     Q_UNUSED(item)
     Q_UNUSED(column)
-    if (!item->isDisabled())
+    if (!item->isDisabled() && item->parent())
         on_btnRemove_clicked();
 }
 
diff --git a/client/src/widgets/SessionInviteWidget.h b/client/src/widgets/SessionInviteWidget.h
index 9a6dc6eb..77e01254 100644
--- a/client/src/widgets/SessionInviteWidget.h
+++ b/client/src/widgets/SessionInviteWidget.h
@@ -63,6 +63,7 @@ class SessionInviteWidget : public QWidget
 
     void setEditable(const bool &editable);
     bool isEditable() const;
+    void setCountLimited(const bool &count_limited);
 
     QList<TeraData> getParticipantsInSession();
     QList<TeraData> getUsersInSession();
@@ -112,6 +113,7 @@ private slots:
     bool m_searching;
     bool m_confirmRemove;
     bool m_editable;
+    bool m_countLimited = true;
 
     QHash<int, TeraData>    m_users; // id, data
     QHash<int, TeraData>    m_participants;
diff --git a/client/src/widgets/SessionInviteWidget.ui b/client/src/widgets/SessionInviteWidget.ui
index e8790d3e..ebc0a944 100644
--- a/client/src/widgets/SessionInviteWidget.ui
+++ b/client/src/widgets/SessionInviteWidget.ui
@@ -36,7 +36,7 @@
       <cursorShape>PointingHandCursor</cursorShape>
      </property>
      <property name="text">
-      <string>Ajouter des invités à la séance</string>
+      <string>Ajouter des invités</string>
      </property>
      <property name="icon">
       <iconset resource="../../resources/TeraClient.qrc">
@@ -56,10 +56,10 @@
    <item>
     <widget class="QFrame" name="frameSelector">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Shape::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Shadow::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="leftMargin">
@@ -117,7 +117,7 @@
            <bool>false</bool>
           </property>
           <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
+           <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
           </property>
          </widget>
         </item>
@@ -152,7 +152,7 @@
            <bool>true</bool>
           </property>
           <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
+           <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
           </property>
          </widget>
         </item>
@@ -187,7 +187,7 @@
            <bool>true</bool>
           </property>
           <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
+           <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
           </property>
          </widget>
         </item>
@@ -225,7 +225,7 @@
            <bool>false</bool>
           </property>
           <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
+           <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
           </property>
          </widget>
         </item>
@@ -323,7 +323,7 @@
       <item>
        <widget class="QListWidget" name="lstInvitables">
         <property name="selectionMode">
-         <enum>QAbstractItemView::ExtendedSelection</enum>
+         <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
         </property>
         <property name="iconSize">
          <size>
@@ -368,10 +368,10 @@
    <item>
     <widget class="QFrame" name="frameInvitees">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Shape::StyledPanel</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Shadow::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="leftMargin">
@@ -386,20 +386,20 @@
       <item>
        <widget class="QLabel" name="lblInvitees">
         <property name="text">
-         <string>Invités dans la séance</string>
+         <string>Invités</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QTreeWidget" name="treeInvitees">
         <property name="editTriggers">
-         <set>QAbstractItemView::NoEditTriggers</set>
+         <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
         </property>
         <property name="showDropIndicator" stdset="0">
          <bool>false</bool>
         </property>
         <property name="selectionMode">
-         <enum>QAbstractItemView::ExtendedSelection</enum>
+         <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
         </property>
         <property name="iconSize">
          <size>
@@ -454,31 +454,33 @@
        </widget>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <property name="rightMargin">
-         <number>6</number>
-        </property>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="lblCount">
-          <property name="text">
-           <string>0 / 7</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <widget class="QFrame" name="frameCount">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="rightMargin">
+          <number>6</number>
+         </property>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="lblCount">
+           <property name="text">
+            <string>0 / 7</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </item>
       <item>
        <widget class="QPushButton" name="btnRemove">
diff --git a/client/src/widgets/TestInvitationsWidget.cpp b/client/src/widgets/TestInvitationsWidget.cpp
index 7c6ca5b6..a4e1bee5 100644
--- a/client/src/widgets/TestInvitationsWidget.cpp
+++ b/client/src/widgets/TestInvitationsWidget.cpp
@@ -30,6 +30,11 @@ void TestInvitationsWidget::setComManager(ComManager *comMan)
 
 }
 
+void TestInvitationsWidget::setCurrentTestTypes(const QList<TeraData> &test_types)
+{
+    m_testTypes = test_types;
+}
+
 void TestInvitationsWidget::loadForProject(const int &id_project)
 {
     setViewMode(ViewMode::VIEWMODE_PROJECT);
@@ -169,6 +174,7 @@ void TestInvitationsWidget::on_btnInvite_clicked()
         m_invitationDialog->deleteLater();
 
     m_invitationDialog = new TestInvitationDialog(this);
+    m_invitationDialog->setTestTypes(m_testTypes);
 
     connect(m_invitationDialog, &TestInvitationDialog::finished, this, &TestInvitationsWidget::onTestInvitationDialogFinished);
     m_invitationDialog->show();
diff --git a/client/src/widgets/TestInvitationsWidget.h b/client/src/widgets/TestInvitationsWidget.h
index d51e6ace..c80ce034 100644
--- a/client/src/widgets/TestInvitationsWidget.h
+++ b/client/src/widgets/TestInvitationsWidget.h
@@ -21,6 +21,8 @@ class TestInvitationsWidget : public QWidget
     ~TestInvitationsWidget();
 
     void setComManager(ComManager* comMan);
+    void setCurrentTestTypes(const QList<TeraData>& test_types);
+
     void loadForProject(const int& id_project);
 
 private slots:
@@ -57,6 +59,8 @@ private slots:
     ComManager*                 m_comManager = nullptr;
     ViewMode                    m_currentView = VIEWMODE_UNKNOWN;
 
+    QList<TeraData>             m_testTypes;
+
     TestInvitationDialog*       m_invitationDialog = nullptr;
 
     QHash<int, QTableWidgetItem*>   m_listInvitations_items; // ID Invitation to QTableWidgetItem* mapping