Bug fix on source account name recuperation