Proposed solution for Issue 1901

Takes care of the admin-defined exchange rate enhancement in issue #1901