Subscription issues

fixes http://manage.dimagi.com/default.asp?99109#564595