diff --git a/package/yast2-users.changes b/package/yast2-users.changes
index c7e73cb18..a8dad9b82 100644
--- a/package/yast2-users.changes
+++ b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Dec  2 12:58:58 UTC 2016 - jreidinger@suse.com
+
+- Set the focus to the first password field to keep the same
+  behavior as before the last change. (for FATE#321754)
+- 3.2.6
+
 -------------------------------------------------------------------
 Thu Dec  1 09:41:59 UTC 2016 - jreidinger@suse.com
 
diff --git a/package/yast2-users.spec b/package/yast2-users.spec
index 82b47c19e..5971bd182 100644
--- a/package/yast2-users.spec
+++ b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.2.5
+Version:        3.2.6
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/src/lib/users/widgets.rb b/src/lib/users/widgets.rb
index 2f159b6b5..3daad7917 100644
--- a/src/lib/users/widgets.rb
+++ b/src/lib/users/widgets.rb
@@ -60,6 +60,9 @@ def contents
     end
 
     def init
+      # focus on first password, so user can immediately write. Also does not
+      # break openQA current test
+      Yast::UI.SetFocus(Id(:pw1))
       current_password = Yast::UsersSimple.GetRootPassword
       return if !current_password || current_password.empty?