Fixed / tweaked upload management for users and admin.