anchor.diff:  migration_action(GlobalOrgId, _AcctInfo) ->
       BifrostSuperuserAuthzId = mv_oc_chef_authz:superuser_id(),
       ErchefSuperuserAuthzId = get_erchef_superuser_authz_id(),
  -    ServerAdminsAuthzId = case create_server_admins_authz_group(BifrostSuperuserAuthzId) of
  -        AuthzId when is_binary(AuthzId) ->
  -            AuthzId;
  -        AuthzError ->
  -            lager:error("Could not create new authz group for server-admins."),
  -            throw(AuthzError)
  -    end,
  -    
  -    case create_server_admins_global_group(ServerAdminsAuthzId, GlobalOrgId) of
  -        {chef_sql, {GroupError, _}} ->
  -	    lager:error("Could not create new erchef group for server-admins."),
  -            throw(GroupError);
  -	_ -> true
  -    end,
  +
  +    %% if server-admins is already created, skip this step
  +    ServerAdminsAuthzId =
  +        case get_server_admins_authz_group_if_exists() of
  +            needs_created ->
  +                lager:info("Global group server-admins does not exist, creating."),
  +                CreatedServerAdminsAuthzId =
  +                    case create_server_admins_authz_group(BifrostSuperuserAuthzId) of
  +                        AuthzId when is_binary(AuthzId) ->
  +                            AuthzId;
  +                        AuthzError ->
  +                            lager:error("Could not create new authz group for server-admins."),
  +                            throw(AuthzError)
  +                    end,
  +
  +                case create_server_admins_global_group(CreatedServerAdminsAuthzId,
  +                                                       GlobalOrgId) of
  +                    {chef_sql, {GroupError, _}} ->
  +                        lager:error("Could not create new erchef group for server-admins."),
  +                        throw(GroupError);
  +                    _ -> true
  +                end,
  +                CreatedServerAdminsAuthzId;
  +            ExistingServerAdminsAuthzId ->
  +                lager:warning("Global group server-admins already exists, skipping creation."),
  +                ExistingServerAdminsAuthzId
  +        end,
   
       %% Put pivotal in the global group
       mv_oc_chef_authz:add_to_group(ServerAdminsAuthzId, actor, ErchefSuperuserAuthzId, BifrostSuperuserAuthzId),
  
positive.code: 
  get_erchef_superuser_authz_id_sql() ->
      <<"SELECT authz_id FROM users WHERE username='pivotal'">>.
  
  create_server_admins_global_group(ServerAdminsAuthzId, GlobalOrgId) ->
      RequestorId = mv_oc_chef_authz:superuser_id(),                                                      
  
negative.code: 
  -record(container, {authz_id}).
  -record(user, {authz_id}).
  -record(group, {authz_id}).
  -record(mover_chef_group, {
            id,
            org_id,	  
  