Fix for both settings case and use in form