Fixes for some bugs with new replace admin thumb option.