Fix undefined template variable
Add missing argument for Form generation