* Fix crashes during initial account setup
