Fixing logic for displaying services dynamically and preventing
duplicate accounts loading from account keys