more work on account/profile stuff