15 Commits (feature/fix_accout_not_found)