Account form and view fixes