Improve API; fix enabled message after having loaded form

Change-Id: Ia5001beca62a0ea1563a0170027875a44b9484bf