Remove asking for account twice