Fix account not added issue