Allow the _report_user_dict to accept a dict
Move dict processing into else statement
Merge pull request #2313 from dimagi/report_user_dict

Allow the _report_user_dict to accept a dict