=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateBulkGateWayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateBulkGateWayConfigAction.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateBulkGateWayConfigAction.java	2016-03-07 13:44:02 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.mobile.action;
 
+import org.hisp.dhis.common.CodeGenerator;
+
 /*
  * Copyright (c) 2004-2016, University of Oslo
  * All rights reserved.
@@ -124,6 +126,7 @@
                 bulkGatewayConfig.setPassword( password );
                 bulkGatewayConfig.setUsername( username );
                 bulkGatewayConfig.setRegion( region );
+                bulkGatewayConfig.setUid( CodeGenerator.generateCode( 10 ) );
 
                 if ( smsConfig.getGateways() == null || smsConfig.getGateways().isEmpty() )
                 {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateClickatellGateWayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateClickatellGateWayConfigAction.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateClickatellGateWayConfigAction.java	2016-03-07 13:44:02 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.mobile.action;
 
+import org.hisp.dhis.common.CodeGenerator;
+
 /*
  * Copyright (c) 2004-2016, University of Oslo
  * All rights reserved.
@@ -119,6 +121,7 @@
                 gatewayConfig.setPassword( password );
                 gatewayConfig.setUsername( username );
                 gatewayConfig.setApiId( apiId );
+                gatewayConfig.setUid( CodeGenerator.generateCode( 10 ) );
 
                 if ( config.getGateways() == null || config.getGateways().isEmpty() )
                 {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java	2016-03-07 13:44:02 +0000
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.hisp.dhis.common.CodeGenerator;
 import org.hisp.dhis.sms.config.GenericHttpGatewayConfig;
 import org.hisp.dhis.sms.config.SmsConfiguration;
 import org.hisp.dhis.sms.config.SmsConfigurationManager;
@@ -126,6 +127,7 @@
                 gatewayConfig.setParameters( map );
                 gatewayConfig.setName( name );
                 gatewayConfig.setUrlTemplate( urlTemplate );
+                gatewayConfig.setUid( CodeGenerator.generateCode( 10 ) );
 
                 if ( config.getGateways() == null || config.getGateways().isEmpty() )
                 {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateModemGateWayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateModemGateWayConfigAction.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateModemGateWayConfigAction.java	2016-03-07 13:44:02 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.mobile.action;
 
+import org.hisp.dhis.common.CodeGenerator;
+
 /*
  * Copyright (c) 2004-2016, University of Oslo
  * All rights reserved.
@@ -159,6 +161,7 @@
                 gatewayConfig.setPin( pin );
                 gatewayConfig.setInbound( inbound );
                 gatewayConfig.setOutbound( outbound );
+                gatewayConfig.setUid( CodeGenerator.generateCode( 10 ) );
 
                 if ( config.getGateways() == null || config.getGateways().isEmpty() )
                 {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateSMPPGateWayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateSMPPGateWayConfigAction.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateSMPPGateWayConfigAction.java	2016-03-07 13:44:02 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.mobile.action;
 
+import org.hisp.dhis.common.CodeGenerator;
+
 /*
  * Copyright (c) 2004-2016, University of Oslo
  * All rights reserved.
@@ -127,6 +129,7 @@
                 gatewayConfig.setUsername( username );
                 gatewayConfig.setAddress( address );
                 gatewayConfig.setPort( port );
+                gatewayConfig.setUid( CodeGenerator.generateCode( 10 ) );
 
                 if ( config.getGateways() == null || config.getGateways().isEmpty() )
                 {