diff --git a/src/blackcore/db/databaseauthentication.cpp b/src/blackcore/db/databaseauthentication.cpp
index b1b3ae022..6a1499b6d 100644
--- a/src/blackcore/db/databaseauthentication.cpp
+++ b/src/blackcore/db/databaseauthentication.cpp
@@ -172,7 +172,7 @@ namespace BlackCore
 
         void CDatabaseAuthenticationService::userChanged()
         {
-            // code goes here
+            // this->logoff();
         }
     } // ns
 } // ns
diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp
index ec99a2641..ba8852dd3 100644
--- a/src/blackgui/components/dblogincomponent.cpp
+++ b/src/blackgui/components/dblogincomponent.cpp
@@ -155,6 +155,8 @@ namespace BlackGui
             }
             else
             {
+                ui->le_Name->clear();
+                ui->te_Roles->clear();
                 this->setModeLogin(true);
             }
         }
diff --git a/src/blackgui/components/dblogincomponent.h b/src/blackgui/components/dblogincomponent.h
index 8cbe9727d..6eaa0c8a7 100644
--- a/src/blackgui/components/dblogincomponent.h
+++ b/src/blackgui/components/dblogincomponent.h
@@ -51,7 +51,7 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbLoginComponent> ui;
-            BlackCore::Db::CDatabaseAuthenticationService m_loginService {this};  //!< login service
+            BlackCore::Db::CDatabaseAuthenticationService m_loginService { this };  //!< login service
 
             //! Overlay messages
             void displayOverlayMessages(const BlackMisc::CStatusMessageList &msgs);
diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index 8ca4006a1..f189b9ab0 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -135,9 +135,6 @@ namespace BlackGui
 
             // vPilot
             this->initVPilotLoading();
-
-            // user changes
-            m_swiftDbUser.setNotifySlot(&CDbMappingComponent::ps_userChanged);
         }
 
         CDbMappingComponent::~CDbMappingComponent()
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index bd55edefa..16b2b02a0 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -316,7 +316,7 @@ namespace BlackGui
             QScopedPointer<CDbModelMappingModifyComponent>      m_modelModifyDialog;   //!< dialog when modifying models
             BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader;        //!< read vPilot rules
             BlackMisc::CDigestSignal                            m_dsStashedModelsChanged { this, &CDbMappingComponent::ps_digestStashedModelsChanged, &CDbMappingComponent::ps_onStashedModelsChangedDigest, 750, 25 };
-            BlackMisc::CData<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this };
+            BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this, &CDbMappingComponent::ps_userChanged };
             const bool vPilotSupport   = true;   //!< vPilot support (will be removed in future)
             bool m_vPilot1stInit       = true;   //!< vPilot extensions initalized?
             bool m_vPilotEnabled       = false;  //!< use vPilot extensions
diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp
index 4be5844b0..f4f697028 100644
--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -117,6 +117,11 @@ namespace BlackMisc
             return this->hasRole("BULKADD");
         }
 
+        bool CAuthenticatedUser::isAuthenticated() const
+        {
+            return this->isEnabled() && this->isValid() && m_authenticated;
+        }
+
         bool CAuthenticatedUser::canDirectlyWriteModels() const
         {
             return this->hasBulkRole() || this->hasBulkAddRole();
@@ -131,7 +136,7 @@ namespace BlackMisc
         {
             if (index.isMyself()) { return CVariant::from(*this); }
             if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
-            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexVatsimId:
@@ -153,7 +158,7 @@ namespace BlackMisc
         {
             if (index.isMyself()) { (*this) = variant.to<CAuthenticatedUser>(); return; }
             if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant); return; }
-            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexVatsimId:
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index 1a3561003..83739726e 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -144,7 +144,7 @@ namespace BlackMisc
             void setAuthenticated(bool authenticated) { m_authenticated = authenticated; }
 
             //! Authenticated
-            bool isAuthenticated() const { return m_authenticated; }
+            bool isAuthenticated() const;
 
             //! Enabled
             void setEnabled(bool enabled) { m_enabled = enabled; }