Develop nick

fixes http://manage.dimagi.com/default.asp?105544#603637 and http://manage.dimagi.com/default.asp?105546#603206