diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 4aa9648f7..e8b7b591a 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -591,7 +591,14 @@ namespace BlackGui
 
         bool CLoginComponent::validateAircraftValues()
         {
-            const CGuiAircraftValues values = this->getAircraftValuesFromGui();
+            CGuiAircraftValues values = this->getAircraftValuesFromGui();
+
+            // fill in combined type if empty
+            if (ui->le_AircraftCombinedType->text().isEmpty() && values.ownAircraftIcao.isLoadedFromDb())
+            {
+                ui->le_AircraftCombinedType->setText(values.ownAircraftIcao.getCombinedType());
+                values.ownAircraftCombinedType = values.ownAircraftIcao.getCombinedType();
+            }
 
             const bool validCombinedType = CAircraftIcaoCode::isValidCombinedType(values.ownAircraftCombinedType);
             ui->lblp_AircraftCombinedType->setTicked(validCombinedType);