As I said, this patch doesn't work. The changes made to upload.php in r5226 need to be reverted, as the changes in that revision were accidentally applied to upload.php instead of users.php unless I'm mistaken.