Removal of deferred as we need to call form validation more than once. Added profile form and other small optimisations