2 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 1a7c043e..ac4b8610 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -101,7 +101,11 @@ ChangePasswordDialog::ChangePasswordDialog(Window *parent, LoginData *loginData)
 
     setLocationRelativeTo(getParent());
     setVisible(true);
-    mFirstPassField->requestFocus();
+    mOldPassField->requestFocus();
+
+    mOldPassField->setActionEventId("change_password");
+    mFirstPassField->setActionEventId("change_password");
+    mSecondPassField->setActionEventId("change_password");
 }
 
 ChangePasswordDialog::~ChangePasswordDialog()
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 06ba729d..4b8755d5 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -81,6 +81,7 @@ UnRegisterDialog::UnRegisterDialog(Window *parent, LoginData *loginData):
     setLocationRelativeTo(getParent());
     setVisible(true);
     mPasswordField->requestFocus();
+    mPasswordField->setActionEventId("cancel");
 }
 
 UnRegisterDialog::~UnRegisterDialog()