move auth_context into initial form creation

keeps us from having to save twice