updated AccountService with default values
added some missing code