diff --git a/src/dialogs/AccountFormDialog.cpp b/src/dialogs/AccountFormDialog.cpp
index 5900451..5e72792 100644
--- a/src/dialogs/AccountFormDialog.cpp
+++ b/src/dialogs/AccountFormDialog.cpp
@@ -191,13 +191,14 @@ bool AccountFormDialog::updateReferenceData()
                 warn(tr("User Name can't be empty!"));
                 return false;
             }
-            User::Current()->setUserName(mNewUserName);
         }
         if (!this->mCommentChanged) User::Current()->setUserName(mLeComment->text());
+        User::Current()->setUserName(mNewUserName);
         bool ret = User::Current()->submitChange();
         if (ret)
         {
             hideWarn();
+            EventCenter::Default()->triggerEvent(CurrentUserNameChanged, nullptr, nullptr);
             LOG_USER_OPERATION("Change User Name")
         }
         else
diff --git a/src/dialogs/ChangePasswordFormDialog.cpp b/src/dialogs/ChangePasswordFormDialog.cpp
index 9f2c221..4d9054f 100644
--- a/src/dialogs/ChangePasswordFormDialog.cpp
+++ b/src/dialogs/ChangePasswordFormDialog.cpp
@@ -37,6 +37,7 @@ void ChangePasswordFormDialog::initLayout()
     layout->addWidget(mLEPasswd);
     auto lblEndline1 = new QLabel(this);
     lblEndline1->setObjectName("endline");
+    lblEndline1->setFixedHeight(3);
     layout->addWidget(lblEndline1);
 
     //add new password
@@ -47,6 +48,7 @@ void ChangePasswordFormDialog::initLayout()
     layout->addWidget(lblNewPasswd);
     layout->addWidget(mLENewPasswd);
     auto lblEndline2 = new QLabel(this);
+    lblEndline2->setFixedHeight(3);
     lblEndline2->setObjectName("endline");
     layout->addWidget(lblEndline2);
 
@@ -58,6 +60,7 @@ void ChangePasswordFormDialog::initLayout()
     layout->addWidget(lblConfirm);
     layout->addWidget(mLEConfirmPasswd);
     auto lblEndline3 = new QLabel(this);
+    lblEndline3->setFixedHeight(3);
     lblEndline3->setObjectName("endline");
     layout->addWidget(lblEndline3);
 
diff --git a/src/event/EventCenter.h b/src/event/EventCenter.h
index bc4d269..b5204d3 100644
--- a/src/event/EventCenter.h
+++ b/src/event/EventCenter.h
@@ -41,6 +41,7 @@ ADD_EVENT_VALUE(WarningMessageRaise)\
 ADD_EVENT_VALUE(ErrorStateActive)\
 ADD_EVENT_VALUE(ErrorStateUnactive)\
 ADD_EVENT_VALUE(StartScanProcess)\
+ADD_EVENT_VALUE(CurrentUserNameChanged)\
 
 
 
diff --git a/src/forms/TopBarWidget.cpp b/src/forms/TopBarWidget.cpp
index 0b249cd..16e9f37 100644
--- a/src/forms/TopBarWidget.cpp
+++ b/src/forms/TopBarWidget.cpp
@@ -93,6 +93,11 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
     connect(EventCenter::Default(), &EventCenter::LoginSuccess, [=](QObject*, QObject* msg) {
         username->setText(User::Current()->getUserName());
     });
+
+    connect(EventCenter::Default(), &EventCenter::CurrentUserNameChanged, [=](QObject*, QObject* msg)
+    {
+        username->setText(User::Current()->getUserName());
+    });
     
     connect(w,&RollingMessageWidget::RollingTimerTriggr,[=](){
         auto anony = JsonObject::Instance()->getAnonymousMode();