Hotfix fairtrade issue 9

Update for Fair Trade sprint 12 and fix issue 9.

This set of changes will reintroduce the changes made for Fair Trade into the main midas sprint 12 branch and will apply the fix for administrator reset of passwords.