change .account. to .user. + rename factory