Added legacy angular into correct places
Merge pull request #2459 from ten24/feature-4-addAccountPaymentFixes

Added legacy angular into correct places