diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index 65780426e..b5eb9566a 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -74,6 +74,12 @@ namespace BlackMisc
             this->m_controller.setCallsign(callsign);
         }
 
+        void CAtcStation::setController(const CUser &controller)
+        {
+            this->m_controller = controller;
+            this->m_controller.setCallsign(this->m_callsign);
+        }
+
         QString CAtcStation::convertToQString(bool i18n) const
         {
             QString s = i18n ?
@@ -436,6 +442,5 @@ namespace BlackMisc
                 break;
             }
         }
-
     } // namespace
 } // namespace
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index eedea7330..442a92aab 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -115,7 +115,7 @@ namespace BlackMisc
             QString getControllerId() const { return m_controller.getId(); }
 
             //! Set controller
-            void setController(const BlackMisc::Network::CUser &controller) { this->m_controller = controller; this->m_controller.setCallsign(this->m_callsign); }
+            void setController(const BlackMisc::Network::CUser &controller);
 
             //! Set controller's name
             void setControllerRealName(const QString &controllerName) { this->m_controller.setRealName(controllerName); }
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index 4a74516a0..59a7ac959 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -97,7 +97,7 @@ namespace BlackMisc
 
         void CSimulatedAircraft::setPilot(const Network::CUser &user)
         {
-            m_pilot = user;
+            this->m_pilot = user;
             this->m_pilot.setCallsign(this->m_callsign);
         }
 
@@ -427,6 +427,7 @@ namespace BlackMisc
         {
             this->m_callsign = callsign;
             this->m_model.setCallsign(callsign);
+            this->m_pilot.setCallsign(callsign);
         }
 
         bool CSimulatedAircraft::isActiveFrequencyWithin8_33kHzChannel(const CFrequency &comFrequency) const
@@ -463,6 +464,5 @@ namespace BlackMisc
             s += this->m_model.toQString(i18n);
             return s;
         }
-
     } // namespace
 } // namespace