Merge "Fix undefined variable in User::setNewpassword"