diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index 8b9fc35b0..fdf1cc87d 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -22,6 +22,12 @@ namespace BlackMisc
 {
     namespace Network
     {
+        CUser::CUser(const CCallsign &callsign)
+            : m_callsign(callsign)
+        {
+            this->deriveHomeBaseFromCallsign();
+        }
+
         CUser::CUser(const QString &id, const QString &realname, const CCallsign &callsign)
             : m_id(id.trimmed()), m_realname(realname), m_callsign(callsign)
         {
@@ -36,6 +42,12 @@ namespace BlackMisc
             this->setRealName(realname); // extracts homebase
         }
 
+        void CUser::setCallsign(const CCallsign &callsign)
+        {
+            m_callsign = callsign;
+            this->deriveHomeBaseFromCallsign();
+        }
+
         QString CUser::convertToQString(bool i18n) const
         {
             Q_UNUSED(i18n);
diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h
index 1e97f09c9..051272820 100644
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -47,7 +47,7 @@ namespace BlackMisc
             CUser() = default;
 
             //! Constructor by callsign
-            CUser(const BlackMisc::Aviation::CCallsign &callsign) : m_callsign(callsign) {}
+            CUser(const BlackMisc::Aviation::CCallsign &callsign);
 
             //! Constructor.
             CUser(const QString &id, const QString &realname, const BlackMisc::Aviation::CCallsign &callsign);
@@ -113,7 +113,7 @@ namespace BlackMisc
             const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; }
 
             //! Set associated callsign
-            void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { m_callsign = callsign; }
+            void setCallsign(const BlackMisc::Aviation::CCallsign &callsign);
 
             //! \copydoc CValueObject::toIcon()
             BlackMisc::CIcon toIcon() const { return this->getCallsign().toIcon(); }