bug #4060 Browser tries to remember wrong password when creating new user
Fix merge conflict