=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/ValidateUserGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/ValidateUserGroupAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/ValidateUserGroupAction.java	2015-05-28 06:26:32 +0000
@@ -28,13 +28,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.List;
-
+import com.opensymphony.xwork2.Action;
 import org.hisp.dhis.i18n.I18n;
 import org.hisp.dhis.user.UserGroup;
 import org.hisp.dhis.user.UserGroupService;
 
-import com.opensymphony.xwork2.Action;
+import java.util.List;
 
 public class ValidateUserGroupAction
     implements Action
@@ -90,20 +89,20 @@
     public String execute()
         throws Exception
     {
-
         if ( name != null )
         {
             List<UserGroup> matches = userGroupService.getUserGroupByName( name );
-            if( matches != null && matches.size() > 0 )
+
+            if ( matches != null && matches.size() > 0 )
             {
                 UserGroup match = matches.get( 0 );
-                
-            if ( match != null && (id == null || match.getId() != id) )
-            {
-                message = i18n.getString( "name_in_use" );
-
-                return ERROR;
-            }
+
+                if ( match != null && (id == null || match.getId() != id) )
+                {
+                    message = i18n.getString( "name_in_use" );
+
+                    return ERROR;
+                }
             }
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm	2015-01-02 20:12:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm	2015-05-28 06:26:32 +0000
@@ -1,32 +1,32 @@
 <script type="text/javascript">
-    $( document ).ready( function() {    
-        validation2( 'addUserGroupForm', function( form ) {
-            form.submit();
-        }, {
-            'beforeValidateHandler': function() {
-                $( '#usersSelected' ).find( 'option' ).attr( 'selected', 'selected' );
-                $( '#userGroupsSelected' ).find( 'option' ).attr( 'selected', 'selected' );
-                #tblDynamicAttributesJavascript()
-            },
-            'rules': getValidationRules( 'userGroup' )
-        } );
-		
-		checkValueIsExist("name", "validateUserGroup.action");
-		
-        $( '#usersAvailable' ).selected( {
-            url: '../api/users.json',
-            target: $( '#usersSelected' ),
-            search: $( '#usersAvailableSearch' ),
-            iterator: 'users'
-        });
-		
-		$( '#userGroupsAvailable' ).selected( {
-            url: '../api/userGroups.json',
-            target: $( '#userGroupsSelected' ),
-            search: $( '#userGroupsAvailableSearch' ),
-            iterator: 'userGroups'
-        });
-    });
+  $(document).ready(function() {
+    validation2('addUserGroupForm', function(form) {
+      form.submit();
+    }, {
+      'beforeValidateHandler': function() {
+        $('#usersSelected').find('option').attr('selected', 'selected');
+        $('#userGroupsSelected').find('option').attr('selected', 'selected');
+        #tblDynamicAttributesJavascript()
+      },
+      'rules': getValidationRules('userGroup')
+    });
+
+    checkValueIsExist("name", "validateUserGroup.action");
+
+    $('#usersAvailable').selected({
+      url: '../api/users.json',
+      target: $('#usersSelected'),
+      search: $('#usersAvailableSearch'),
+      iterator: 'users'
+    });
+
+    $('#userGroupsAvailable').selected({
+      url: '../api/userGroups.json',
+      target: $('#userGroupsSelected'),
+      search: $('#userGroupsAvailableSearch'),
+      iterator: 'userGroups'
+    });
+  });
 </script>
 
 <h3>$i18n.getString( "add_user_group" )</h3>
@@ -56,7 +56,6 @@
     "i18n_selected": "group_members"
 })
 
-
 #jqSelected({
   "prefix": "userGroups",
   "i18n_available": "available_managed_user_groups",
@@ -65,8 +64,8 @@
 
 
 <p>
-    <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
-    <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'getAllUserGroups.action' )" style="width:10em"/>
+  <input type="submit" value="$i18n.getString( 'add' )" style="width:10em"/>
+  <input type="button" value="$i18n.getString( 'cancel' )" onclick="dhis2.commons.redirectCurrentPage( 'getAllUserGroups.action' )" style="width:10em"/>
 </p>
 
 </form>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm	2015-01-02 20:12:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm	2015-05-28 06:26:32 +0000
@@ -1,32 +1,32 @@
 <script type="text/javascript">
-    $( document ).ready( function() {    
-        validation2( 'editUserGroupForm', function( form ) {
-            form.submit();
-        }, {
-            'beforeValidateHandler': function() {
-                $( '#usersSelected' ).find( 'option' ).attr( 'selected', 'selected' );
-                $( '#userGroupsSelected' ).find( 'option' ).attr( 'selected', 'selected' );
-                #tblDynamicAttributesJavascript()
-            },
-            'rules': getValidationRules( 'userGroup' )
-        } );
-        
-		checkValueIsExist("name", "validateUserGroup.action", { id: userGroupId });
-        
-        $( '#usersAvailable' ).selected( {
-            url: '../api/users.json',
-            target: $( '#usersSelected' ),
-            search: $( '#usersAvailableSearch' ),
-            iterator: 'users'
-        });
-
-		$( '#userGroupsAvailable' ).selected( {
-            url: '../api/userGroups.json',
-            target: $( '#userGroupsSelected' ),
-            search: $( '#userGroupsAvailableSearch' ),
-            iterator: 'userGroups'
-        });		
-    });	
+  $(document).ready(function() {
+    validation2('editUserGroupForm', function(form) {
+      form.submit();
+    }, {
+      'beforeValidateHandler': function() {
+        $('#usersSelected').find('option').attr('selected', 'selected');
+        $('#userGroupsSelected').find('option').attr('selected', 'selected');
+        #tblDynamicAttributesJavascript()
+      },
+      'rules': getValidationRules('userGroup')
+    });
+
+    checkValueIsExist("name", "validateUserGroup.action", { id: $group.id });
+
+    $('#usersAvailable').selected({
+      url: '../api/users.json',
+      target: $('#usersSelected'),
+      search: $('#usersAvailableSearch'),
+      iterator: 'users'
+    });
+
+    $('#userGroupsAvailable').selected({
+      url: '../api/userGroups.json',
+      target: $('#userGroupsSelected'),
+      search: $('#userGroupsAvailableSearch'),
+      iterator: 'userGroups'
+    });
+  });
 </script>
 
 <h3>$i18n.getString( "edit_user_group" )</h3>