Working on account settings and related specs