Merge pull request #19502 from rohitwaghchaure/removed_in_flag_test_while_creating_default_account

fix: code cleanup