Fix resetting the password after failed authentications

This has been broken by commit 661344.
Fix centering the indicator in the no-xinerama case
Merge branch 'master' into wayland