Forms now show correct default values