=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-02-26 07:47:48 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-03-05 07:46:13 +0000
@@ -329,9 +329,10 @@
                 
                 smsCode.setCode( normalSMSCode.getCode() );
                 smsCode.setDataElementId( normalSMSCode.getDataElement().getId() );
-                smsCode.setOptionId( normalSMSCode.getId() );
+                smsCode.setOptionId( normalSMSCode.getOptionId());
                 smsCodes.add( smsCode );
             }
+            mobileSMSCommand.setSmsCodes( smsCodes );
             smsCommands.add( mobileSMSCommand );
         }
         return smsCommands;