diff --git a/api/server/interface/accountservice/internal/service.go b/api/server/interface/accountservice/internal/service.go
index 4a6e38f..07d3579 100644
--- a/api/server/interface/accountservice/internal/service.go
+++ b/api/server/interface/accountservice/internal/service.go
@@ -239,12 +239,6 @@ func (s *service) JoinOrganization(
 		s.logger.Debug("Account is already a member", mzap.StorableRef(org), mzap.StorableRef(account))
 		return nil
 	}
-	org.Members = append(org.Members, account.ID)
-	if err := s.orgDB.Update(ctx, *account.GetID(), org); err != nil {
-		s.logger.Warn("Failed to update organization members list",
-			zap.Error(err), mzap.StorableRef(account), mzap.StorableRef(org))
-		return err
-	}
 
 	role := &model.Role{
 		DescriptionRef:  roleDescID,
@@ -256,6 +250,13 @@ func (s *service) JoinOrganization(
 			mzap.StorableRef(org), mzap.ObjRef("role_description_ref", roleDescID))
 		return err
 	}
+
+	org.Members = append(org.Members, account.ID)
+	if err := s.orgDB.Update(ctx, *account.GetID(), org); err != nil {
+		s.logger.Warn("Failed to update organization members list",
+			zap.Error(err), mzap.StorableRef(account), mzap.StorableRef(org))
+		return err
+	}
 	return nil
 }