diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index a0187611e..401d092cd 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -53,6 +53,7 @@
 using namespace BlackConfig;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
+using namespace BlackMisc::Audio;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
@@ -95,8 +96,11 @@ namespace BlackGui
             connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard);
             connect(&m_networkSetup, &CNetworkSetup::setupChanged, this, &CLoginComponent::reloadSetup, Qt::QueuedConnection);
 
-            ui->comp_FsdDetails->showEnableInfo(true);
-            ui->comp_FsdDetails->setFsdSetupEnabled(false);
+            ui->form_FsdDetails->showEnableInfo(true);
+            ui->form_FsdDetails->setFsdSetupEnabled(false);
+
+            ui->form_Voice->showEnableInfo(true);
+            ui->form_Voice->setVoiceSetupEnabled(false);
 
             ui->lblp_AircraftCombinedType->setToolTips("ok", "wrong");
             ui->lblp_AirlineIcao->setToolTips("ok", "wrong");
@@ -260,12 +264,18 @@ namespace BlackGui
                 currentServer.setUser(user);
 
                 // FSD setup, then override
-                if (ui->comp_FsdDetails->isFsdSetupEnabled())
+                if (ui->form_FsdDetails->isFsdSetupEnabled())
                 {
-                    const CFsdSetup fsd = ui->comp_FsdDetails->getValue();
+                    const CFsdSetup fsd = ui->form_FsdDetails->getValue();
                     currentServer.setFsdSetup(fsd);
                 }
 
+                if (ui->form_Voice->isVoiceSetupEnabled())
+                {
+                    const CVoiceSetup voice = ui->form_Voice->getValue();
+                    currentServer.setVoiceSetup(voice);
+                }
+
                 ui->frp_CurrentServer->setServer(currentServer);
                 sGui->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser());
 
@@ -273,6 +283,11 @@ namespace BlackGui
                 ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
 
                 // Login
+                if (sGui->getIContextAudio())
+                {
+                    sGui->getIContextAudio()->setVoiceSetup(currentServer.getVoiceSetup());
+                }
+
                 msg = sGui->getIContextNetwork()->connectToNetwork(currentServer, mode);
                 if (msg.isSuccess())
                 {
diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index b07f6a7d2..c603bba37 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -89,7 +89,7 @@
          <enum>QTabWidget::North</enum>
         </property>
         <property name="currentIndex">
-         <number>0</number>
+         <number>2</number>
         </property>
         <widget class="QWidget" name="pg_NetworkVatsim">
          <property name="toolTip">
@@ -241,17 +241,29 @@
            <number>3</number>
           </property>
           <item>
-           <widget class="BlackGui::Editors::CFsdSetupForm" name="comp_FsdDetails">
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Plain</enum>
-            </property>
-            <property name="lineWidth">
-             <number>0</number>
-            </property>
-           </widget>
+           <widget class="BlackGui::Editors::CFsdSetupForm" name="form_FsdDetails"/>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="pg_Voice">
+         <attribute name="title">
+          <string>Voice</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="vl_Voice">
+          <property name="leftMargin">
+           <number>3</number>
+          </property>
+          <property name="topMargin">
+           <number>6</number>
+          </property>
+          <property name="rightMargin">
+           <number>3</number>
+          </property>
+          <property name="bottomMargin">
+           <number>3</number>
+          </property>
+          <item alignment="Qt::AlignTop">
+           <widget class="BlackGui::Editors::CVoiceSetupForm" name="form_Voice"/>
           </item>
          </layout>
         </widget>
@@ -704,6 +716,24 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Editors::CServerForm</class>
+   <extends>QFrame</extends>
+   <header>blackgui/editors/serverform.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Editors::CFsdSetupForm</class>
+   <extends>QFrame</extends>
+   <header>blackgui/editors/fsdsetupform.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Editors::CVoiceSetupForm</class>
+   <extends>QFrame</extends>
+   <header>blackgui/editors/voicesetupform.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CModelMatcherLogEnable</class>
    <extends>QFrame</extends>
@@ -715,12 +745,6 @@
    <extends>QLabel</extends>
    <header>blackgui/ticklabel.h</header>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Editors::CFsdSetupForm</class>
-   <extends>QFrame</extends>
-   <header>blackgui/editors/fsdsetupform.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
    <extends>QFrame</extends>
@@ -738,12 +762,6 @@
    <extends>QComboBox</extends>
    <header>blackgui/components/serverlistselector.h</header>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Editors::CServerForm</class>
-   <extends>QFrame</extends>
-   <header>blackgui/editors/serverform.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::CLoginModeButtons</class>
    <extends>QFrame</extends>