NOJIRA Fix for user create/edit issues.