Added initial account form handling