Fix for last feature to prevent double addition of tmp suffixes if
saving again while required field is still blank