MIFOSX-1398,MIFOSX-1403

Fix for https://mifosforge.jira.com/browse/MIFOSX-1275