diff --git a/League/Components/VenueEditorComponentModel.cs b/League/Components/VenueEditorComponentModel.cs
index da63ef48..a48f880e 100644
--- a/League/Components/VenueEditorComponentModel.cs
+++ b/League/Components/VenueEditorComponentModel.cs
@@ -8,7 +8,7 @@ namespace League.Components;
 public class VenueEditorComponentModel
 {
     [HiddenInput]
-    public long Id { get; set; }
+    public long? Id { get; set; }
 
     [HiddenInput]
     public bool IsNew { get; set; }
@@ -81,7 +81,7 @@ public void MapFormFieldsToEntity(VenueEntity venueEntity)
     {
         // The entity is populated from the database,
         // so we can track all eventual changes to fields
-        venueEntity.Id = IsNew ? default : Id;
+        venueEntity.Id = IsNew ? default : Id ?? default;
         venueEntity.IsNew = IsNew;
         venueEntity.Name = Name;
         venueEntity.Extension = Extension;
@@ -89,7 +89,7 @@ public void MapFormFieldsToEntity(VenueEntity venueEntity)
         venueEntity.City = City;
         venueEntity.Street = Street;
         venueEntity.Direction = Direction;
-        if (venueEntity.Longitude.HasValue && venueEntity.Latitude.HasValue)
+        if (venueEntity is { Longitude: null, Latitude: null })
         {
             venueEntity.Longitude = Longitude;
             venueEntity.Latitude = Latitude;
diff --git a/League/Components/VenueSelector.cs b/League/Components/VenueSelector.cs
index f1cb375e..116d0aa6 100644
--- a/League/Components/VenueSelector.cs
+++ b/League/Components/VenueSelector.cs
@@ -6,13 +6,11 @@ namespace League.Components;
 
 public class VenueSelector : ViewComponent
 {
-    private readonly ITenantContext _tenantContext;
-    private readonly TournamentManager.MultiTenancy.AppDb _appDb;
+    private readonly AppDb _appDb;
     private readonly ILogger<VenueSelector> _logger;
 
     public VenueSelector(ITenantContext tenantContext, ILogger<VenueSelector> logger)
     {
-        _tenantContext = tenantContext;
         _appDb = tenantContext.DbContext.AppDb;
         _logger = logger;
     }
diff --git a/League/Controllers/Team.cs b/League/Controllers/Team.cs
index 91ec1f8d..8237c505 100644
--- a/League/Controllers/Team.cs
+++ b/League/Controllers/Team.cs
@@ -305,10 +305,10 @@ public async Task<IActionResult> SelectVenue([FromForm][Bind("TeamId, VenueId")]
             _appDb.TeamRepository.GetTeamEntityAsync(new PredicateExpression(TeamFields.Id == model.TeamId),
                 cancellationToken);
 
-        if (teamEntity == null || !model.VenueId.HasValue ||
-            !await _appDb.VenueRepository.IsValidVenueIdAsync(model.VenueId, cancellationToken))
+        if (teamEntity == null)
         {
-            return NotFound();
+            TempData.Put<MyTeamMessageModel.MyTeamMessage>(nameof(MyTeamMessageModel.MyTeamMessage), new MyTeamMessageModel.MyTeamMessage { AlertType = SiteAlertTagHelper.AlertType.Danger, MessageId = MyTeamMessageModel.MessageId.TeamDataFailure});
+            return JsonResponseRedirect(TenantLink.Action(nameof(MyTeam), nameof(Team), new { model.TeamId }));
         }
 
         if (!(await _authorizationService.AuthorizeAsync(User, new TeamEntity(teamEntity.Id),
@@ -319,19 +319,21 @@ public async Task<IActionResult> SelectVenue([FromForm][Bind("TeamId, VenueId")]
         }
 
         model.TournamentId = _tenantContext.TournamentContext.TeamTournamentId;
+        teamEntity.VenueId = model.VenueId;
+        var teamVenueValidator = new TeamVenueValidator(teamEntity, _tenantContext);
 
-        if (!ModelState.IsValid)
+        if (!await model.ValidateAsync(teamVenueValidator, ModelState, cancellationToken))
         {
             return PartialView(Views.ViewNames.Team._SelectVenueModalPartial, model);
         }
             
-        TempData.Put<MyTeamMessageModel.MyTeamMessage>(nameof(MyTeamMessageModel.MyTeamMessage), new MyTeamMessageModel.MyTeamMessage { AlertType = SiteAlertTagHelper.AlertType.Danger, MessageId = MyTeamMessageModel.MessageId.TeamDataFailure});
+        TempData.Put<MyTeamMessageModel.MyTeamMessage>(nameof(MyTeamMessageModel.MyTeamMessage), new MyTeamMessageModel.MyTeamMessage { AlertType = SiteAlertTagHelper.AlertType.Danger, MessageId = MyTeamMessageModel.MessageId.VenueSelectFailure });
         try
         {
             teamEntity.VenueId = model.VenueId;
             if(await _appDb.GenericRepository.SaveEntityAsync(teamEntity, false, false, cancellationToken))
             {
-                TempData.Put<MyTeamMessageModel.MyTeamMessage>(nameof(MyTeamMessageModel.MyTeamMessage), new MyTeamMessageModel.MyTeamMessage { AlertType = SiteAlertTagHelper.AlertType.Success, MessageId = MyTeamMessageModel.MessageId.VenueCreateSuccess});
+                TempData.Put<MyTeamMessageModel.MyTeamMessage>(nameof(MyTeamMessageModel.MyTeamMessage), new MyTeamMessageModel.MyTeamMessage { AlertType = SiteAlertTagHelper.AlertType.Success, MessageId = MyTeamMessageModel.MessageId.VenueSelectSuccess});
             }
             else
             {
diff --git a/League/Controllers/TeamApplication.cs b/League/Controllers/TeamApplication.cs
index 09b71203..8f65c837 100644
--- a/League/Controllers/TeamApplication.cs
+++ b/League/Controllers/TeamApplication.cs
@@ -1,4 +1,5 @@
-using Axuno.Tools.GeoSpatial;
+using System.Security.Claims;
+using Axuno.Tools.GeoSpatial;
 using League.BackgroundTasks;
 using League.Components;
 using League.ConfigurationPoco;
@@ -18,6 +19,7 @@
 using TournamentManager.DAL.TypedViewClasses;
 using TournamentManager.ModelValidators;
 using TournamentManager.MultiTenancy;
+using TeamVenueSetKind = League.Models.TeamApplicationViewModels.ApplicationSessionModel.TeamVenueSetKind;
 
 namespace League.Controllers;
 
@@ -35,6 +37,7 @@ public class TeamApplication : AbstractController
     private readonly GoogleConfiguration _googleConfig;
     private readonly Axuno.BackgroundTask.IBackgroundQueue _queue;
     private readonly SendEmailTask _sendEmailTask;
+    private readonly SignInManager<Identity.ApplicationUser> _signInManager;
     private const string TeamApplicationSessionName = "TeamApplicationSession";
 
     public TeamApplication(ITenantContext tenantContext,
@@ -42,7 +45,8 @@ public TeamApplication(ITenantContext tenantContext,
         IStringLocalizer<TeamApplication> localizer, IAuthorizationService authorizationService,
         RegionInfo regionInfo,
         IConfiguration configuration, Axuno.BackgroundTask.IBackgroundQueue queue,
-        SendEmailTask sendEmailTask, ILogger<TeamApplication> logger)
+        SendEmailTask sendEmailTask, SignInManager<Identity.ApplicationUser> signInManger,
+        ILogger<TeamApplication> logger)
     {
         _tenantContext = tenantContext;
         _timeZoneConverter = timeZoneConverter;
@@ -53,6 +57,7 @@ public TeamApplication(ITenantContext tenantContext,
         _sendEmailTask = sendEmailTask;
         _appDb = tenantContext.DbContext.AppDb;
         _authorizationService = authorizationService;
+        _signInManager = signInManger;
         _logger = logger;
     }
 
@@ -133,7 +138,7 @@ public async Task<IActionResult> SelectTeam([FromForm] ApplicationSelectTeamMode
         System.Diagnostics.Debug.Assert(selectTeamModel.SelectedTeamId != null, "selectTeamModel.SelectedTeamId != null");
 
         var sessionModel = await GetModelFromSession(cancellationToken);
-        if (sessionModel.TeamInRoundIsSet && sessionModel.TeamIsSet &&
+        if (sessionModel is { TeamInRoundIsSet: true, TeamIsSet: true } &&
             sessionModel.Team!.Id != selectTeamModel.SelectedTeamId)
         {
             sessionModel.TeamInRoundIsSet = false;
@@ -204,7 +209,7 @@ public async Task<IActionResult> EditTeam(CancellationToken cancellationToken)
             Team = GetTeamEditorComponentModel(teamEntity)
         };
 
-        if(sessionModel.TeamInRoundIsSet) teamEditModel.Round.SelectedRoundId = sessionModel.TeamInRound!.RoundId;
+        if (sessionModel.TeamInRoundIsSet) teamEditModel.Round.SelectedRoundId = sessionModel.TeamInRound!.RoundId;
         if (sessionModel.TeamIsSet) teamEditModel.Team = sessionModel.Team;
             
         return View(Views.ViewNames.TeamApplication.EditTeam, teamEditModel);
@@ -219,7 +224,7 @@ public async Task<IActionResult> EditTeam([FromForm] TeamEditModel teamEditModel
         ViewData["TournamentName"] = sessionModel.TournamentName;
 
         TeamEntity? teamEntity = null;
-        if (teamEditModel.Team != null && !teamEditModel.Team.IsNew)
+        if (teamEditModel.Team is { IsNew: false })
         {
             teamEntity = await _appDb.TeamRepository.GetTeamEntityAsync(new PredicateExpression(TeamFields.Id == teamEditModel.Team.Id), cancellationToken);
             if (teamEntity == null)
@@ -284,6 +289,7 @@ public async Task<IActionResult> SelectVenue(CancellationToken cancellationToken
         ViewData["TournamentName"] = sessionModel.TournamentName;
 
         sessionModel.Venue!.IsNew = true;
+        sessionModel.VenueIsSet = TeamVenueSetKind.NotSet;
         SaveModelToSession(sessionModel);
 
         var teamEntity = new TeamEntity();
@@ -299,7 +305,7 @@ public async Task<IActionResult> SelectVenue(CancellationToken cancellationToken
             {
                 TournamentId = sessionModel.PreviousTournamentId ?? _tenantContext.TournamentContext.ApplicationTournamentId,
                 TeamId = teamEntity.Id,
-                VenueId = (sessionModel.VenueIsSet && !sessionModel.Venue.IsNew)
+                VenueId = (sessionModel.VenueIsSet == TeamVenueSetKind.ExistingVenue && !sessionModel.Venue.IsNew)
                     ? sessionModel.Venue.Id
                     : teamEntity.VenueId
             }
@@ -325,24 +331,24 @@ public async Task<IActionResult> SelectVenue([FromForm][Bind("TeamId, VenueId")]
             if (teamEntity == null) return Redirect(TenantLink.Action(nameof(SelectTeam))!);
         }
 
-        if (selectVenueModel.VenueId.HasValue && !await _appDb.VenueRepository.IsValidVenueIdAsync(selectVenueModel.VenueId, cancellationToken))
-        {
-            return Redirect(TenantLink.Action(nameof(SelectVenue))!);
-        }
-
         selectVenueModel.TournamentId = sessionModel.PreviousTournamentId ?? _tenantContext.TournamentContext.ApplicationTournamentId;
+        var teamValidator = new TeamVenueValidator(new TeamEntity { VenueId = selectVenueModel.VenueId }, _tenantContext);
 
-        if (!ModelState.IsValid)
+        if (!await selectVenueModel.ValidateAsync(teamValidator, ModelState, cancellationToken))
         {
             return View(Views.ViewNames.TeamApplication.SelectVenue, selectVenueModel);
         }
 
-        sessionModel.Venue!.IsNew = !selectVenueModel.VenueId.HasValue;
-        sessionModel.Venue.Id = selectVenueModel.VenueId ?? 0;
+        sessionModel.VenueIsSet =
+            selectVenueModel.VenueId == null ? TeamVenueSetKind.NoVenue : TeamVenueSetKind.ExistingVenue;
+        sessionModel.Venue!.IsNew = false;
+        sessionModel.Venue.Id = selectVenueModel.VenueId;
             
         SaveModelToSession(sessionModel);
 
-        return Redirect(TenantLink.Action(nameof(EditVenue))!);
+        return Redirect(sessionModel.VenueIsSet == TeamVenueSetKind.NoVenue
+            ? TenantLink.Action(nameof(Confirm))!
+            : TenantLink.Action(nameof(EditVenue))!);
     }
 
     [HttpGet("edit-venue")]
@@ -350,15 +356,20 @@ public async Task<IActionResult> EditVenue(bool? isNew, CancellationToken cancel
     {
         var sessionModel = await GetModelFromSession(cancellationToken);
         if (!sessionModel.IsFromSession) return Redirect(TenantLink.Action(nameof(SelectTeam))!);
+
+        if (sessionModel.VenueIsSet == TeamVenueSetKind.NoVenue)
+            return Redirect(TenantLink.Action(nameof(Confirm))!);
+
         ViewData["TournamentName"] = sessionModel.TournamentName;
 
         if (isNew.HasValue && isNew.Value)
         {
             sessionModel.Venue = GetVenueEditorComponentModel(new VenueEntity());
-            sessionModel.VenueIsSet = false;
+            sessionModel.VenueIsSet = TeamVenueSetKind.NewVenue;
         }
 
         var venueEntity = new VenueEntity();
+        sessionModel.Venue?.MapFormFieldsToEntity(venueEntity);
         var venueTeams = new List<VenueTeamRow>();
         if (!sessionModel.Venue!.IsNew)
         {
@@ -371,6 +382,7 @@ public async Task<IActionResult> EditVenue(bool? isNew, CancellationToken cancel
                 return Redirect(TenantLink.Action(nameof(SelectVenue))!);
             }
 
+            sessionModel.VenueIsSet = TeamVenueSetKind.ExistingVenue;
             venueTeams = await _appDb.VenueRepository.GetVenueTeamRowsAsync(new PredicateExpression(VenueTeamFields.VenueId == venueEntity.Id), cancellationToken);
         }
 
@@ -378,7 +390,6 @@ public async Task<IActionResult> EditVenue(bool? isNew, CancellationToken cancel
             venueTeams.Select(vt => vt.TeamName).Distinct().OrderBy(n => n).ToList());
 
         venueEditModel.Venue.MapEntityToFormFields(venueEditModel.VenueEntity!);
-        if (sessionModel.VenueIsSet) venueEditModel.Venue = sessionModel.Venue!;
             
         return View(Views.ViewNames.TeamApplication.EditVenue, venueEditModel);
     }
@@ -395,7 +406,7 @@ public async Task<IActionResult> EditVenue([FromForm] VenueEditModel venueEditMo
         if (!venueEditModel.Venue.IsNew)
         {
             venueEntity = (await _appDb.VenueRepository.GetVenuesAsync(
-                new PredicateExpression(VenueFields.Id == venueEditModel.Venue?.Id),
+                new PredicateExpression(VenueFields.Id == venueEditModel.Venue.Id),
                 cancellationToken)).FirstOrDefault();
 
             if (venueEntity == null)
@@ -434,7 +445,7 @@ public async Task<IActionResult> EditVenue([FromForm] VenueEditModel venueEditMo
         }
 
         sessionModel.Venue!.MapEntityToFormFields(venueEditModel.VenueEntity!);
-        sessionModel.VenueIsSet = true;
+        sessionModel.VenueIsSet = venueEditModel.Venue.IsNew ? TeamVenueSetKind.NewVenue : TeamVenueSetKind.ExistingVenue;
         SaveModelToSession(sessionModel);
             
         return Redirect(TenantLink.Action(nameof(Confirm))!);
@@ -496,9 +507,13 @@ public async Task<IActionResult> Confirm(bool done, CancellationToken cancellati
             sessionModel.Team!.MapFormFieldsToEntity(teamInRoundEntity.Team);
             // An EXISTING venue MUST be set by its ID, otherwise no venue will be stored for the Team
             if(!sessionModel.Venue!.IsNew) teamInRoundEntity.Team.VenueId = sessionModel.Venue.Id;
-            // Add a new venue, or take over changes to an existing venue
-            teamInRoundEntity.Team.Venue = new VenueEntity();
-            sessionModel.Venue.MapFormFieldsToEntity(teamInRoundEntity.Team.Venue);
+
+            if (sessionModel.VenueIsSet is TeamVenueSetKind.NewVenue or TeamVenueSetKind.ExistingVenue)
+            {
+                // Add a new venue, or take over changes to an existing venue
+                teamInRoundEntity.Team.Venue = new VenueEntity();
+                sessionModel.Venue.MapFormFieldsToEntity(teamInRoundEntity.Team.Venue);
+            }
 
             // Adds the current user as team manager, unless she already is team manager
             await AddManagerToTeamEntity(teamInRoundEntity.Team, cancellationToken);
@@ -700,7 +715,7 @@ private async Task<ApplicationSessionModel> GetNewSessionModel(CancellationToken
         
         return new ApplicationSessionModel
         {
-            TeamInRound = new League.Models.TeamViewModels.TeamInRoundModel {IsNew = true},
+            TeamInRound = new TeamInRoundModel {IsNew = true},
             Team = new TeamEditorComponentModel {HtmlFieldPrefix = nameof(ApplicationSessionModel.Team), IsNew = true},
             Venue = new VenueEditorComponentModel {HtmlFieldPrefix = nameof(ApplicationSessionModel.Venue), IsNew = true},
             TournamentName = teamApplicationTournament.Name,
@@ -750,5 +765,8 @@ private async Task AddManagerToTeamEntity(TeamEntity teamEntity, CancellationTok
                 mot.UserId = GetCurrentUserId() ?? throw new InvalidOperationException("Current user ID must not be null");
             }
         }
+
+        // make sure that any changes are immediately reflected in the user's application cookie
+        await _signInManager.RefreshSignInAsync(await _signInManager.UserManager.FindByIdAsync(User.FindFirstValue(ClaimTypes.NameIdentifier)));
     }
 }
diff --git a/League/Models/TeamApplicationViewModels/ApplicationSessionModel.cs b/League/Models/TeamApplicationViewModels/ApplicationSessionModel.cs
index bf5e01aa..d005b84a 100644
--- a/League/Models/TeamApplicationViewModels/ApplicationSessionModel.cs
+++ b/League/Models/TeamApplicationViewModels/ApplicationSessionModel.cs
@@ -4,6 +4,14 @@ namespace League.Models.TeamApplicationViewModels;
 
 public class ApplicationSessionModel
 {
+    public enum TeamVenueSetKind
+    {
+        NotSet = 0,
+        NoVenue,
+        ExistingVenue,
+        NewVenue
+    }
+
     /// <summary>
     /// The state of the model will be set to <see langword="true"/> whenever it is restored from a session.
     /// </summary>
@@ -15,7 +23,7 @@ public class ApplicationSessionModel
     public bool TeamIsSet { get; set; } = false;
     public TeamEditorComponentModel? Team { get; set; }
 
-    public bool VenueIsSet { get; set; } = false;
+    public TeamVenueSetKind VenueIsSet { get; set; } = TeamVenueSetKind.NotSet;
     public VenueEditorComponentModel? Venue { get; set; }
 
     /// <summary>
diff --git a/League/Models/TeamViewModels/TeamVenueSelectModel.cs b/League/Models/TeamViewModels/TeamVenueSelectModel.cs
index b7f85a6b..b0340e5c 100644
--- a/League/Models/TeamViewModels/TeamVenueSelectModel.cs
+++ b/League/Models/TeamViewModels/TeamVenueSelectModel.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using TournamentManager.ModelValidators;
 
 namespace League.Models.TeamViewModels;
 
@@ -12,4 +13,15 @@ public class TeamVenueSelectModel
     public long? VenueId { get; set; }
     [HiddenInput] 
     public string ReturnUrl { get; set; } = string.Empty;
+
+    public async Task<bool> ValidateAsync(TeamVenueValidator teamValidator, ModelStateDictionary modelState, CancellationToken cancellationToken)
+    {
+        var fact = await teamValidator.CheckAsync(TeamVenueValidator.FactId.VenueIsSetIfRequired, cancellationToken);
+        if (fact is { IsChecked: true, Success: false }) modelState.AddModelError(fact.FieldNames.First(), fact.Message);
+
+        fact = await teamValidator.CheckAsync(TeamVenueValidator.FactId.VenueIsValid, cancellationToken);
+        if (fact is { IsChecked: true, Success: false }) modelState.AddModelError(fact.FieldNames.First(), fact.Message);
+
+        return modelState.IsValid;
+    }
 }
diff --git a/League/Views/Shared/Components/TeamEditor/Default.cshtml b/League/Views/Shared/Components/TeamEditor/Default.cshtml
index d1335cff..5c8827cf 100644
--- a/League/Views/Shared/Components/TeamEditor/Default.cshtml
+++ b/League/Views/Shared/Components/TeamEditor/Default.cshtml
@@ -67,15 +67,18 @@ ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix = Model.HtmlFieldPrefix;
 <script type="text/javascript" site-on-modal-shown="true" site-on-content-loaded="true">
     const onMatchDayOfWeekChangeFunction = function() {
         const matchTimeEle = document.getElementById('@Html.IdFor(m => m.MatchTime)');
+        const matchTimeSpanEle = document.querySelector('span[data-td-target="@nameof(Model.MatchTime)-c"]');
         if (this.value === '') {
-            matchTimeEle.setAttribute('disabled', 'disabled');
-            matchTimeEle.style.cursor = 'not-allowed';
             matchTimeEle.value = '';
-            document.querySelector('span[data-td-target="@nameof(Model.MatchTime)-c"]').style.cursor = 'not-allowed';
+            matchTimeEle.setAttribute('readonly', '');
+            matchTimeEle.style.cursor = 'not-allowed';
+            matchTimeEle.style.backgroundColor = 'var(--bs-gray-100)';
+            matchTimeSpanEle.style.display = 'none';
         } else {
-            matchTimeEle.removeAttribute('disabled');
+            matchTimeEle.removeAttribute('readonly');
             matchTimeEle.style.cursor = 'auto';
-            document.querySelector('span[data-td-target="@nameof(Model.MatchTime)-c"]').style.cursor = 'pointer';
+            matchTimeEle.style.backgroundColor = '';
+            matchTimeSpanEle.style.display = 'block';
         }
     };
     const matchDayOfWeek = document.getElementById('@Html.IdFor(m => m.MatchDayOfWeek)');
diff --git a/League/Views/Shared/Components/TeamEditor/Default.de.resx b/League/Views/Shared/Components/TeamEditor/Default.de.resx
index 87dd73a9..c366b08c 100644
--- a/League/Views/Shared/Components/TeamEditor/Default.de.resx
+++ b/League/Views/Shared/Components/TeamEditor/Default.de.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Not specified" xml:space="preserve">
-    <value>Nicht bestimmt</value>
+    <value>Nicht festgelegt</value>
   </data>
   <data name="Please select a weekday" xml:space="preserve">
     <value>Bitte einen Wochentag auswählen</value>
diff --git a/League/Views/Shared/Components/VenueEditor/Default.de.resx b/League/Views/Shared/Components/VenueEditor/Default.de.resx
index 87dd73a9..c366b08c 100644
--- a/League/Views/Shared/Components/VenueEditor/Default.de.resx
+++ b/League/Views/Shared/Components/VenueEditor/Default.de.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Not specified" xml:space="preserve">
-    <value>Nicht bestimmt</value>
+    <value>Nicht festgelegt</value>
   </data>
   <data name="Please select a weekday" xml:space="preserve">
     <value>Bitte einen Wochentag auswählen</value>
diff --git a/League/Views/Shared/Components/VenueSelector/Default.cshtml b/League/Views/Shared/Components/VenueSelector/Default.cshtml
index c5cf99bb..82657f84 100644
--- a/League/Views/Shared/Components/VenueSelector/Default.cshtml
+++ b/League/Views/Shared/Components/VenueSelector/Default.cshtml
@@ -1,5 +1,6 @@
 @using League.Components
 @using Microsoft.AspNetCore.Mvc.Localization
+@using TournamentManager.MultiTenancy
 @inject IViewLocalizer Localizer
 @model VenueSelectorComponentModel
 @{
@@ -22,9 +23,9 @@
         </tr>
         </thead>
         <tbody>
-        @if ((Model.Filter & VenueSelectorComponentModel.Criteria.NotSpecified) == VenueSelectorComponentModel.Criteria.NotSpecified && Model.VenueNotSpecifiedKey.HasValue)
+        @if ((Model.Filter & VenueSelectorComponentModel.Criteria.NotSpecified) == VenueSelectorComponentModel.Criteria.NotSpecified)
         {
-            <tr data-venue-id="@Model.VenueNotSpecifiedKey"><td></td><td colspan="2">@Localizer["Not specified"]</td></tr>
+                <tr data-venue-id="@Model.VenueNotSpecifiedKey"><td></td><td colspan="2">@Localizer["There is no venue assigned"]</td></tr>
         }
         @if (Model.Filter == VenueSelectorComponentModel.Criteria.AllVenues)
         {
diff --git a/League/Views/Shared/Components/VenueSelector/Default.de.resx b/League/Views/Shared/Components/VenueSelector/Default.de.resx
index d3b70ac2..a1370dcb 100644
--- a/League/Views/Shared/Components/VenueSelector/Default.de.resx
+++ b/League/Views/Shared/Components/VenueSelector/Default.de.resx
@@ -132,9 +132,6 @@
   <data name="No venues found at this time" xml:space="preserve">
     <value>Keine Spielorte gefunden</value>
   </data>
-  <data name="Not specified" xml:space="preserve">
-    <value>Nicht festgelegt</value>
-  </data>
   <data name="Other venues" xml:space="preserve">
     <value>Andere Spielorte</value>
   </data>
@@ -144,4 +141,7 @@
   <data name="Team venues" xml:space="preserve">
     <value>Team Spielorte</value>
   </data>
+  <data name="There is no venue assigned" xml:space="preserve">
+    <value>Kein Spielort zugeordnet</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/League/Views/Team/MyTeam.cshtml b/League/Views/Team/MyTeam.cshtml
index 46ea9f56..b00ef4aa 100644
--- a/League/Views/Team/MyTeam.cshtml
+++ b/League/Views/Team/MyTeam.cshtml
@@ -69,12 +69,17 @@
                             <div class="text-success col-12">@Localizer["Club"]</div>
                             <div class="col-12">@teamVenueInfo.TeamClubName</div>
                         }
-                        @if (teamVenueInfo.MatchDayOfWeek.HasValue && teamVenueInfo.MatchTime.HasValue)
+                        @if (teamVenueInfo is { MatchDayOfWeek: not null, MatchTime: not null })
                         {
                             // MatchTime is defined as a zoned time, NOT UTC. It is always the same, never mind DST
                             <div class="text-success col-12">@Localizer["Home match day"]</div>
                             <div class="col-12 mb-2"><i class="far fa-calendar-alt"></i><span class="d-inline-block me-2"></span>@DateTimeFormatInfo.CurrentInfo?.GetDayName((DayOfWeek)teamVenueInfo.MatchDayOfWeek), @(DateTime.UtcNow.Date.Add(teamVenueInfo.MatchTime.Value).ToShortTimeString()) @(Model.TimeZoneConverter.ToZonedTime(DateTime.UtcNow)?.Abbreviation)</div>
                         }
+                        else
+                        {
+                            <div class="text-success col-12">@Localizer["Home match day"]</div>
+                            <div class="col-12 mb-2">[@(Localizer["Not specified"])]</div>
+                        }
                         <div class="text-muted small col-12">
                             @{ var zonedTime = Model.TimeZoneConverter.ToZonedTime(teamVenueInfo.TeamModifiedOn)!;}
                             @Localizer["Last update"]: @zonedTime.DateTimeOffset.DateTime.ToShortDateString() @zonedTime.DateTimeOffset.DateTime.ToLongTimeString() @zonedTime.Abbreviation
@@ -149,7 +154,7 @@
                                 {
                                     <div>
                                         <i class="fas fa-map-marker-alt"></i><span class="d-inline-block me-2"></span>
-                                        @Localizer["There is no venue assigned to the team"].
+                                        [@(Localizer["There is no venue assigned to the team"])]
                                     </div>
                                 }
                             </div>
diff --git a/League/Views/Team/MyTeam.de.resx b/League/Views/Team/MyTeam.de.resx
index b9036e10..61a3e8e0 100644
--- a/League/Views/Team/MyTeam.de.resx
+++ b/League/Views/Team/MyTeam.de.resx
@@ -144,6 +144,9 @@
   <data name="No team photo has been uploaded" xml:space="preserve">
     <value>Es wurde kein Foto hochgeladen</value>
   </data>
+  <data name="Not specified" xml:space="preserve">
+    <value>Nicht festgelegt</value>
+  </data>
   <data name="Photo of {0}" xml:space="preserve">
     <value>Foto vom {0}</value>
   </data>
diff --git a/League/Views/Team/Single.cshtml b/League/Views/Team/Single.cshtml
index 8c879d77..b0edd0bf 100644
--- a/League/Views/Team/Single.cshtml
+++ b/League/Views/Team/Single.cshtml
@@ -32,22 +32,49 @@
             <div class="text-success col-md-3">@Localizer["Club"]</div>
             <div class="col-md-9">@Model.TeamVenueRoundInfo.TeamClubName</div>
         }
-        @if (Model.TeamVenueRoundInfo.MatchDayOfWeek.HasValue && Model.TeamVenueRoundInfo.MatchTime.HasValue)
-        {
-            // MatchTime is defined as a zoned time, NOT UTC. It is always the same, never mind DST
-            <div class="text-success col-md-3">@Localizer["Home match day"]</div>
-            <div class="col-md-9 mb-2"><i class="far fa-calendar-alt"></i><span class="d-inline-block me-2"></span>@DateTimeFormatInfo.CurrentInfo.GetDayName((DayOfWeek)Model.TeamVenueRoundInfo.MatchDayOfWeek), @(DateTime.UtcNow.Date.Add(Model.TeamVenueRoundInfo.MatchTime.Value).ToShortTimeString()) @(Model.TimeZoneConverter.ToZonedTime(DateTime.UtcNow)!.Abbreviation)</div>
-        }
-        @if (Model.TeamVenueRoundInfo.VenueId.HasValue)
-        {
-            <div class="text-success col-md-3">@Localizer["Venue"]</div>
-            <div class="col-md-7 mb-2">
-                <div><i class="fas fa-map-marker-alt"></i><span class="d-inline-block me-2"></span><span class="fw-bold">@Model.TeamVenueRoundInfo.VenueName</span> <span>@{if (!string.IsNullOrWhiteSpace(Model.TeamVenueRoundInfo.VenueExtension))
-                    {<text>(@Model.TeamVenueRoundInfo.VenueExtension)</text>}}</span></div>
-                <div>@(string.Join(", ", Model.TeamVenueRoundInfo.VenuePostalCode, Model.TeamVenueRoundInfo.VenueCity, Model.TeamVenueRoundInfo.VenueStreet))</div>
-                <div><a class="link" asp-action="@nameof(League.Controllers.Map.Venue)" asp-controller="@nameof(League.Controllers.Map)" asp-route-tenant="@tenantUrlSegment" asp-route-id="@Model.TeamVenueRoundInfo.VenueId.Value">@Localizer["Direction"]</a></div>
-            </div>
-        }
+        
+        <div class="text-success col-md-3">@Localizer["Home match day"]</div>
+        <div class="col-md-9 mb-2">
+            @if (Model.TeamVenueRoundInfo.MatchDayOfWeek.HasValue && Model.TeamVenueRoundInfo.MatchTime.HasValue)
+            {
+                @* MatchTime is defined as a zoned time, NOT UTC. It is always the same, never mind DST*@
+                <i class="far fa-calendar-alt"></i><span class="d-inline-block me-2"></span>@DateTimeFormatInfo.CurrentInfo.GetDayName((DayOfWeek)Model.TeamVenueRoundInfo.MatchDayOfWeek)<text>, </text> 
+                @(DateTime.UtcNow.Date.Add(Model.TeamVenueRoundInfo.MatchTime.Value).ToShortTimeString())<text> </text>@(Model.TimeZoneConverter.ToZonedTime(DateTime.UtcNow)!.Abbreviation)
+            }
+            else
+            {
+                <span>[@(Localizer["Not specified"])]</span>
+            }
+        </div>
+
+        <div class="text-success col-md-3">@Localizer["Venue"]</div>
+        <div class="col-md-7 mb-2">
+            @if (Model.TeamVenueRoundInfo.VenueId.HasValue)
+            {
+                <div>
+                    <i class="fas fa-map-marker-alt"></i><span class="d-inline-block me-2"></span><span class="fw-bold">@Model.TeamVenueRoundInfo.VenueName</span>
+                    <span>
+                        @{
+                            if (!string.IsNullOrWhiteSpace(Model.TeamVenueRoundInfo.VenueExtension))
+                            {
+                                <text>(@Model.TeamVenueRoundInfo.VenueExtension)</text>
+                            }
+                        }
+                    </span>
+                </div>
+                <div>
+                    @(string.Join(", ", Model.TeamVenueRoundInfo.VenuePostalCode, Model.TeamVenueRoundInfo.VenueCity, Model.TeamVenueRoundInfo.VenueStreet))
+                </div>
+                <div>
+                    <a class="link" asp-action="@nameof(League.Controllers.Map.Venue)" asp-controller="@nameof(League.Controllers.Map)" asp-route-tenant="@tenantUrlSegment" asp-route-id="@Model.TeamVenueRoundInfo.VenueId.Value">@Localizer["Direction"]</a>
+                </div>
+            }
+            else
+            {
+                <span>[@(Localizer["There is no venue assigned to the team"])]</span>
+            }
+        </div>
+        
         @if (Model.TeamUserRoundInfos.Count > 0)
         {
             @if (Model.ShowContactInfos)
diff --git a/League/Views/Team/Single.de.resx b/League/Views/Team/Single.de.resx
index 940b209d..e63eb3f1 100644
--- a/League/Views/Team/Single.de.resx
+++ b/League/Views/Team/Single.de.resx
@@ -129,6 +129,9 @@
   <data name="Home match day" xml:space="preserve">
     <value>Heimspieltag</value>
   </data>
+  <data name="Not specified" xml:space="preserve">
+    <value>Nicht festgelegt</value>
+  </data>
   <data name="Photo of" xml:space="preserve">
     <value>Foto vom</value>
   </data>
@@ -144,6 +147,9 @@
   <data name="Team Photo" xml:space="preserve">
     <value>Teamfoto</value>
   </data>
+  <data name="There is no venue assigned to the team" xml:space="preserve">
+    <value>Dem Team ist kein Spielort zugeordnet</value>
+  </data>
   <data name="Venue" xml:space="preserve">
     <value>Spielort</value>
   </data>
diff --git a/League/Views/Team/_MyTeamMessagesPartial.Designer.cs b/League/Views/Team/_MyTeamMessagesPartial.Designer.cs
index 647a3e94..3822385a 100644
--- a/League/Views/Team/_MyTeamMessagesPartial.Designer.cs
+++ b/League/Views/Team/_MyTeamMessagesPartial.Designer.cs
@@ -19,7 +19,7 @@ namespace League.Views.Team {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class _MyTeamMessagesPartial {
@@ -160,7 +160,7 @@ public static string VenueEditSuccess {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Saving the selected team venue has failed.
+        ///   Looks up a localized string similar to Changing the selected team venue has failed.
         /// </summary>
         public static string VenueSelectFailure {
             get {
@@ -169,7 +169,7 @@ public static string VenueSelectFailure {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The selected team venue has been saved successfully.
+        ///   Looks up a localized string similar to The selected team venue has been changed successfully.
         /// </summary>
         public static string VenueSelectSuccess {
             get {
diff --git a/League/Views/Team/_MyTeamMessagesPartial.cshtml b/League/Views/Team/_MyTeamMessagesPartial.cshtml
index 4cda328b..9e23aea4 100644
--- a/League/Views/Team/_MyTeamMessagesPartial.cshtml
+++ b/League/Views/Team/_MyTeamMessagesPartial.cshtml
@@ -13,7 +13,7 @@
                 W‌rite(_MyTeamMessagesPartial.TeamDataSuccess);
                 break;
             case MyTeamMessageModel.MessageId.TeamDataFailure:
-                W‌rite(_MyTeamMessagesPartial.TeamDataSuccess);
+                W‌rite(_MyTeamMessagesPartial.TeamDataFailure);
                 break;
             case MyTeamMessageModel.MessageId.MemberAddSuccess:
                 W‌rite(_MyTeamMessagesPartial.MemberAddSuccess);
diff --git a/League/Views/Team/_MyTeamMessagesPartial.de.resx b/League/Views/Team/_MyTeamMessagesPartial.de.resx
index 3d2a628a..7270f4c9 100644
--- a/League/Views/Team/_MyTeamMessagesPartial.de.resx
+++ b/League/Views/Team/_MyTeamMessagesPartial.de.resx
@@ -151,7 +151,7 @@
     <value>Geänderte Spielortdaten wurden gespeichert</value>
   </data>
   <data name="VenueSelectFailure" xml:space="preserve">
-    <value>Speichern des gewählten Spielort des Teams ist fehlgeschlagen</value>
+    <value>Ändern des Spielorts für das Teams ist fehlgeschlagen</value>
   </data>
   <data name="VenueSelectSuccess" xml:space="preserve">
     <value>Der gewählte Spielort des Teams wurde gespeichert</value>
diff --git a/League/Views/Team/_MyTeamMessagesPartial.resx b/League/Views/Team/_MyTeamMessagesPartial.resx
index c58482b7..008137fa 100644
--- a/League/Views/Team/_MyTeamMessagesPartial.resx
+++ b/League/Views/Team/_MyTeamMessagesPartial.resx
@@ -151,9 +151,9 @@
     <value>Team venue data have been updated sucessfully</value>
   </data>
   <data name="VenueSelectFailure" xml:space="preserve">
-    <value>Saving the selected team venue has failed</value>
+    <value>Changing the selected team venue has failed</value>
   </data>
   <data name="VenueSelectSuccess" xml:space="preserve">
-    <value>The selected team venue has been saved successfully</value>
+    <value>The selected team venue has been changed successfully</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/League/Views/Team/_SelectVenueModalPartial.cshtml b/League/Views/Team/_SelectVenueModalPartial.cshtml
index 6964085a..2d1713f5 100644
--- a/League/Views/Team/_SelectVenueModalPartial.cshtml
+++ b/League/Views/Team/_SelectVenueModalPartial.cshtml
@@ -1,6 +1,7 @@
 @using League.Controllers
 @using Microsoft.AspNetCore.Mvc.Localization
 @using TournamentManager.MultiTenancy
+@using League.Components
 @inject IViewLocalizer Localizer
 @inject ITenantContext TenantContext
 @model League.Models.TeamViewModels.TeamVenueSelectModel
@@ -8,13 +9,14 @@
 <!-- Modal -->
 <modal id="select-venue" title="@Localizer["Select team venue"].Value" dialog-class="modal-lg" tabindex="-1">
     <modal-body class="pb-0">
-        @{ ValueTuple<long, IList<long>, League.Components.VenueSelectorComponentModel.Criteria, League.Components.VenueSelectorComponentModel.Criteria, long?> componentModel =
+        @{ ValueTuple<long, IList<long>, VenueSelectorComponentModel.Criteria, VenueSelectorComponentModel.Criteria, long?> componentModel =
                  (Model.TournamentId,
                      new List<long>(new[] { Model.TeamId }),
-                     League.Components.VenueSelectorComponentModel.Criteria.VenuesOfTeams | League.Components.VenueSelectorComponentModel.Criteria.Active | League.Components.VenueSelectorComponentModel.Criteria.Unused,
-                     League.Components.VenueSelectorComponentModel.Criteria.VenuesOfTeams | League.Components.VenueSelectorComponentModel.Criteria.Active | League.Components.VenueSelectorComponentModel.Criteria.Unused,
-                     default(long?)); }
-        @(await Component.InvokeAsync<League.Components.VenueSelector>(componentModel))
+                     (!TenantContext.TournamentContext.TeamRuleSet.HomeVenue.MustBeSet ? VenueSelectorComponentModel.Criteria.NotSpecified : 0) |
+                     VenueSelectorComponentModel.Criteria.VenuesOfTeams | VenueSelectorComponentModel.Criteria.Active | VenueSelectorComponentModel.Criteria.Unused,
+                     VenueSelectorComponentModel.Criteria.VenuesOfTeams | VenueSelectorComponentModel.Criteria.Active | VenueSelectorComponentModel.Criteria.Unused,
+                     default); }
+        @(await Component.InvokeAsync<VenueSelector>(componentModel))
         <form asp-controller="@nameof(Team)" asp-action="@nameof(Team.SelectVenue)" asp-route-tenant="@tenantUrlSegment" method="post" novalidate>
             <input asp-for="TeamId" type="hidden" />
             <input asp-for="VenueId" type="hidden" />
diff --git a/League/Views/TeamApplication/Confirm.cshtml b/League/Views/TeamApplication/Confirm.cshtml
index 16d06c3c..4b6269b7 100644
--- a/League/Views/TeamApplication/Confirm.cshtml
+++ b/League/Views/TeamApplication/Confirm.cshtml
@@ -1,6 +1,7 @@
 @using System.Globalization
 @using Axuno.Tools.DateAndTime
 @using League.Controllers
+@using League.Models.TeamApplicationViewModels
 @using Microsoft.AspNetCore.Mvc.Localization
 @using TournamentManager.MultiTenancy
 @inject IViewLocalizer Localizer
@@ -27,30 +28,55 @@
             <div class="text-success col-md-3">@Localizer["Club"]</div>
             <div class="col-md-9">@Model.SessionModel.Team.ClubName</div>
         }
+        
+        <div class="text-success col-md-3">@Localizer["Home match day"]</div>
+        <div class="col-md-9">
         @if (Model.SessionModel.Team.MatchDayOfWeek.HasValue && Model.SessionModel.Team.MatchTime.HasValue)
         {
             // MatchTime is defined as a zoned time, NOT UTC. It is always the same, never mind DST
-            <div class="text-success col-md-3">@Localizer["Home match day"]</div>
-            <div class="col-md-9 mb-2"><i class="far fa-calendar-alt"></i><span class="d-inline-block me-2"></span>@DateTimeFormatInfo.CurrentInfo.GetDayName((DayOfWeek)Model.SessionModel.Team.MatchDayOfWeek), @(DateTime.UtcNow.Date.Add(Model.SessionModel.Team.MatchTime.Value.ToTimeSpan()).ToShortTimeString()) @(TimeZoneConverter.ToZonedTime(DateTime.UtcNow)!.Abbreviation)</div>
+            <i class="far fa-calendar-alt"></i><span class="d-inline-block me-2"></span>
+            @DateTimeFormatInfo.CurrentInfo.GetDayName((DayOfWeek)Model.SessionModel.Team.MatchDayOfWeek)<text>, </text>@(DateTime.UtcNow.Date.Add(Model.SessionModel.Team.MatchTime.Value.ToTimeSpan()).ToShortTimeString())<text> </text>@(TimeZoneConverter.ToZonedTime(DateTime.UtcNow)!.Abbreviation)
+        }
+        else
+        {
+            <span>[@(Localizer["Not specified"])]</span>
         }
-        <div class="text-success col-md-3">@(Model.SessionModel.Venue!.IsNew ? Localizer["New venue"] : Localizer["Existing venue"])</div>
-        <div class="col-md-7 mb-2">
-            <div><i class="fas fa-map-marker-alt"></i><span class="d-inline-block me-2"></span><span class="fw-bold">@Model.SessionModel.Venue.Name</span></div>
-            <div>@(string.Join(", ", Model.SessionModel.Venue.PostalCode, Model.SessionModel.Venue.City, Model.SessionModel.Venue.Street))</div>
         </div>
-        @if (!string.IsNullOrWhiteSpace(Model.SessionModel.Venue.Direction))
+        @if (Model.SessionModel.VenueIsSet == ApplicationSessionModel.TeamVenueSetKind.NoVenue)
+        {
+            <div class="text-success col-md-3">@Localizer["Venue"]</div>
+            <div class="col-md-7 mb-2">
+                [@(Localizer["There is no venue assigned to the team"])]
+            </div>
+        }
+        else
         {
-            <div class="text-success col-md-3">@Localizer["Directions, hints"]</div>
+            <div class="text-success col-md-3">@(Model.SessionModel.Venue!.IsNew ? Localizer["New venue"] : Localizer["Existing venue"])</div>
             <div class="col-md-7 mb-2">
-                <div><i class="fas fa-info-circle"></i><span class="d-inline-block me-2"></span>@Model.SessionModel.Venue.Direction</div>
+                <div><i class="fas fa-map-marker-alt"></i><span class="d-inline-block me-2"></span><span class="fw-bold">@Model.SessionModel.Venue.Name</span></div>
+                <div>@(string.Join(", ", Model.SessionModel.Venue.PostalCode, Model.SessionModel.Venue.City, Model.SessionModel.Venue.Street))</div>
             </div>
+            @if (!string.IsNullOrWhiteSpace(Model.SessionModel.Venue.Direction))
+            {
+                <div class="text-success col-md-3">@Localizer["Directions, hints"]</div>
+                <div class="col-md-7 mb-2">
+                    <div><i class="fas fa-info-circle"></i><span class="d-inline-block me-2"></span>@Model.SessionModel.Venue.Direction</div>
+                </div>
+            }
         }
     </div>
     <div class="row">
         <div class="mb-3 col-12 col-md-6">
             <form asp-controller="@nameof(TeamApplication)" asp-action="@nameof(TeamApplication.Confirm)" asp-route-tenant="@tenantUrlSegment" method="post" role="form" novalidate>
-                <a asp-controller="@nameof(TeamApplication)" asp-action="@nameof(TeamApplication.EditVenue)" asp-route-tenant="@tenantUrlSegment" class="btn btn-secondary d-inline-block">@Localizer["Back"]</a>
-                <input type="hidden" id="Done" name="Done" value="true" />
+                @if (Model.SessionModel.VenueIsSet == ApplicationSessionModel.TeamVenueSetKind.NoVenue)
+                {
+                    <a asp-controller="@nameof(TeamApplication)" asp-action="@nameof(TeamApplication.SelectVenue)" asp-route-tenant="@tenantUrlSegment" class="btn btn-secondary d-inline-block">@Localizer["Back"]</a>
+                }
+                else
+                {
+                    <a asp-controller="@nameof(TeamApplication)" asp-action="@nameof(TeamApplication.EditVenue)" asp-route-tenant="@tenantUrlSegment" class="btn btn-secondary d-inline-block">@Localizer["Back"]</a>
+                }
+                <input type="hidden" id="Done" name="Done" value="true"/>
                 <button type="submit" class="btn btn-primary d-inline-block ">@Localizer["Confirm and save"]</button>
             </form>
         </div>
diff --git a/League/Views/TeamApplication/Confirm.de.resx b/League/Views/TeamApplication/Confirm.de.resx
index e2969ab2..6b440601 100644
--- a/League/Views/TeamApplication/Confirm.de.resx
+++ b/League/Views/TeamApplication/Confirm.de.resx
@@ -150,4 +150,13 @@
   <data name="Round" xml:space="preserve">
     <value>Runde</value>
   </data>
+  <data name="There is no venue assigned to the team" xml:space="preserve">
+    <value>Dem Team ist kein Spielort zugeordnet</value>
+  </data>
+  <data name="Venue" xml:space="preserve">
+    <value>Spielort</value>
+  </data>
+  <data name="Not specified" xml:space="preserve">
+    <value>Nicht festgelegt</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/League/Views/TeamApplication/SelectVenue.cshtml b/League/Views/TeamApplication/SelectVenue.cshtml
index bcee1e84..053a54d9 100644
--- a/League/Views/TeamApplication/SelectVenue.cshtml
+++ b/League/Views/TeamApplication/SelectVenue.cshtml
@@ -1,22 +1,24 @@
 @using League.Controllers
 @using Microsoft.AspNetCore.Mvc.Localization
 @using TournamentManager.MultiTenancy
+@using League.Components
 @inject IViewLocalizer Localizer
 @inject ITenantContext TenantContext
 @model League.Models.TeamViewModels.TeamVenueSelectModel
-@{ ValueTuple<long, IList<long>, League.Components.VenueSelectorComponentModel.Criteria, League.Components.VenueSelectorComponentModel.Criteria, long?> componentModel =
+@{ ValueTuple<long, IList<long>, VenueSelectorComponentModel.Criteria, VenueSelectorComponentModel.Criteria, long?> componentModel =
           (Model.TournamentId,
               new List<long>(new[] { Model.TeamId }),
-              League.Components.VenueSelectorComponentModel.Criteria.VenuesOfTeams | League.Components.VenueSelectorComponentModel.Criteria.Active | League.Components.VenueSelectorComponentModel.Criteria.Unused,
-              League.Components.VenueSelectorComponentModel.Criteria.VenuesOfTeams | League.Components.VenueSelectorComponentModel.Criteria.Active | League.Components.VenueSelectorComponentModel.Criteria.Unused,
-              default(long?));
+              (!TenantContext.TournamentContext.TeamRuleSet.HomeVenue.MustBeSet ? VenueSelectorComponentModel.Criteria.NotSpecified : 0) |
+              VenueSelectorComponentModel.Criteria.VenuesOfTeams | VenueSelectorComponentModel.Criteria.Active | VenueSelectorComponentModel.Criteria.Unused,
+              VenueSelectorComponentModel.Criteria.VenuesOfTeams | VenueSelectorComponentModel.Criteria.Active | VenueSelectorComponentModel.Criteria.Unused,
+              default);
     ViewData["Title"] = Localizer["Team Registration"].Value + " - " + ViewData["TournamentName"];
     var tenantUrlSegment = TenantContext.SiteContext.UrlSegmentValue;
 }
 <div class="mb-0 pb-2">
     <h2 class="h2">@ViewData["Title"]</h2>
     <hr class="mb-3" />
-    @(await Component.InvokeAsync<League.Components.VenueSelector>(componentModel))
+    @(await Component.InvokeAsync<VenueSelector>(componentModel))
     <form asp-controller="@nameof(TeamApplication)" asp-action="@nameof(TeamApplication.SelectVenue)" asp-route-tenant="@tenantUrlSegment" method="post" novalidate>
         <input asp-for="TeamId" type="hidden" />
         <input asp-for="VenueId" type="hidden" />
diff --git a/League/Views/TeamApplication/Start.cshtml b/League/Views/TeamApplication/Start.cshtml
index 25a18aac..44573f36 100644
--- a/League/Views/TeamApplication/Start.cshtml
+++ b/League/Views/TeamApplication/Start.cshtml
@@ -17,7 +17,7 @@
         <div class="col-12">
             <h4 class="h4">Who can register</h4>
             <p>
-                Eligible team members can easily register their team for the next season.
+                Team contacts can easily register their team for the next season.
                 This applies to all teams that have ever participated in a season.
             </p>
             <p>
@@ -37,9 +37,9 @@
             <p>
                 To ensure that the match day can be determined automatically and without overlap, please note the following:
                 <ul>
-                    <li>All teams using one field of a venue at the same time must select that venue.</li>
+                    <li>All teams using one field of a venue at the same time <strong>must</strong> select that venue.</li>
                     <li>
-                        If several fields are available at a venue that can be used simultaneously,
+                        If several fields are available at a venue that can be used <strong>simultaneously</strong>,
                         a separate venue should be created for each field, and assigned to the using team.
                     </li>
                 </ul>
diff --git a/League/Views/TeamApplication/Start.de.cshtml b/League/Views/TeamApplication/Start.de.cshtml
index 536a5fbb..5ae2dc50 100644
--- a/League/Views/TeamApplication/Start.de.cshtml
+++ b/League/Views/TeamApplication/Start.de.cshtml
@@ -19,7 +19,7 @@
         <div class="col-12">
             <h4 class="h4">Wer kann anmelden</h4>
             <p>
-                Berechtigte Mitglieder der Teams können ihr Team sehr einfach für die nächste Saison anmelden.
+                Teamkontakte können ihr Team sehr einfach für die nächste Saison anmelden.
                 Das gilt für alle Teams die jemals an einer Saison teilgenommen haben.
             </p>
             <p>
@@ -30,17 +30,17 @@
                 Folgende Angaben werden abgefragt und sollten daher zur Hand sein:
                 <ul>
                     <li>Teamname</li>
-                    <li>Names des Vereins (sofern zutreffend)</li>
+                    <li>Name des Vereins (sofern zutreffend)</li>
                     <li>Wochentag und Uhrzeit der Heimspiele</li>
-                    <li>Name und genau Anschrift des Spielorts</li>
+                    <li>Name und genaue Anschrift des Spielorts</li>
                 </ul>
             </p>
             <h4 class="h4">Spielort</h4>
             <p>
-                Damit die Spieltag automatisch und ohne Überschneidungen ermittelt werden können,
+                Damit die Spieltage automatisch und ohne Überschneidungen ermittelt werden können,
                 bitte folgendes beachten:
                 <ul>
-                    <li>Alle Teams, die ein Feld eines Spielort zeitgleich nutzen, müssen diesen auswählen.</li>
+                    <li>Alle Teams, die ein Feld eines Spielort zeitgleich nutzen, <strong>müssen</strong> diesen auswählen.</li>
                     <li>
                         Wenn an einem Spielort mehrere Felder zur Verfügung stehen, die <strong>zeitgleich</strong> genutzt werden können,
                         soll für jedes Spielfeld ein eigener Spielort angelegt und dem nutzenden Team zuordnet werden.
@@ -55,8 +55,8 @@
                 </li>
                 <li>Die Teamkontakte werden den Mitgliedern anderer Teams angezeigt (und nur diesen).</li>
                 <li>
-                    Zusätzlich zu den Teamkontakten können jedem Team SpielerInnen zugeordnet werden.
-                    Die Kontaktdaten der SpielerInnen sind nur den Teamkollegen zugänglich.
+                    Zusätzlich zu den Teamkontakten können jedem Team Spielerinnen bzw. Spieler zugeordnet werden.
+                    Die Kontaktdaten der Spielerinnen bzw. Spielern sind nur den Teamkollegen zugänglich.
                 </li>
             </ul>
         </div>
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
index 77343631..6f656fa9 100644
--- a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamValidatorTests.cs
@@ -35,7 +35,17 @@ public TeamValidatorTests()
             {
                 return Task.FromResult(teamEntity.Id < 10 ? teamEntity.Name : null);
             });
+
+        var venueRepoMock = TestMocks.GetRepo<VenueRepository>();
+        venueRepoMock
+            .Setup(rep => rep.IsValidVenueIdAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+            .Callback(() => { }).Returns((long? theValue, CancellationToken cancellationToken) =>
+            {
+                return Task.FromResult(theValue is < 10);
+            });
+
         appDbMock.Setup(a => a.TeamRepository).Returns(teamRepoMock.Object);
+        appDbMock.Setup(a => a.VenueRepository).Returns(venueRepoMock.Object);
 
         var dbContextMock = TestMocks.GetDbContextMock();
         dbContextMock.SetupAppDb(appDbMock);
@@ -88,16 +98,19 @@ public async Task Unique(string teamName, long teamId, bool expected)
         });
     }
 
-    [TestCase(null, false, false)]
-    [TestCase("20:00:00", false, false)]
-    [TestCase(null, true, false)]
-    [TestCase(null, true, true)]
-    [TestCase("20:00:00", true, false)]
-    [TestCase("20:00:00", true, true)]
-
-    public async Task MatchTime_Must_Be_Set(TimeSpan? matchTime, bool isEditable, bool mustBeSet)
+    // DOW always set
+    [TestCase(null, 1, false, false, false)]
+    [TestCase("20:00:00",1, false, false, false)]
+    [TestCase(null, 1, true, false, false)]
+    [TestCase(null, 1, true, true, false)]
+    [TestCase("20:00:00", 1,true, false, true)]
+    [TestCase("20:00:00", 1, true, true, true)]
+    // DOW missing
+    [TestCase(null, null, true, false, true)]
+    [TestCase("20:00:00", null, true, false, false)]
+    public async Task MatchTime_Must_Be_Set(TimeSpan? matchTime, int? dow, bool isEditable, bool mustBeSet, bool expected)
     {
-        var team = new TeamEntity { MatchTime = matchTime, MatchDayOfWeek = 1};
+        var team = new TeamEntity { MatchTime = matchTime, MatchDayOfWeek = dow};
 
         _tenantContext.TournamentContext.TeamRuleSet = new TeamRules { HomeMatchTime = new HomeMatchTime { IsEditable = isEditable, MustBeSet = mustBeSet} };
         var tv = new TeamValidator(team, _tenantContext);
@@ -105,11 +118,8 @@ public async Task MatchTime_Must_Be_Set(TimeSpan? matchTime, bool isEditable, bo
         var factResult = await tv.CheckAsync(TeamValidator.FactId.MatchDayOfWeekAndTimeIsSet, CancellationToken.None);
         Assert.Multiple(() =>
         {
-            Assert.AreEqual(factResult.Enabled, isEditable && mustBeSet);
-            if (factResult.Enabled)
-            {
-                Assert.AreEqual(matchTime.HasValue, factResult.Success);
-            }
+            Assert.That(factResult.Enabled, Is.EqualTo(isEditable));
+            Assert.That(factResult.Success, Is.EqualTo(expected));
             Assert.IsNull(factResult.Exception);
         });
     }
@@ -214,4 +224,4 @@ public async Task DayOfWeek_Must_Be_In_Range(DayOfWeek? dayOfWeek, bool errorIfN
             Assert.IsNull(factResult.Exception);
         });
     }
-}
\ No newline at end of file
+}
diff --git a/TournamentManager/TournamentManager.Tests/ModelValidators/TeamVenueValidatorTests.cs b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamVenueValidatorTests.cs
new file mode 100644
index 00000000..52f35421
--- /dev/null
+++ b/TournamentManager/TournamentManager.Tests/ModelValidators/TeamVenueValidatorTests.cs
@@ -0,0 +1,94 @@
+using NUnit.Framework;
+using TournamentManager.DAL.EntityClasses;
+using TournamentManager.ModelValidators;
+using Moq;
+using TournamentManager.Data;
+using TournamentManager.MultiTenancy;
+using TournamentManager.Tests.TestComponents;
+using TeamRules = TournamentManager.MultiTenancy.TeamRules;
+
+namespace TournamentManager.Tests.ModelValidators;
+
+[TestFixture]
+public class TeamVenueValidatorTests
+{
+    private readonly ITenantContext _tenantContext;
+#pragma warning disable IDE0052 // Remove unread private members
+    private readonly AppDb _appDb; // mocked in CTOR
+#pragma warning restore IDE0052 // Remove unread private members
+
+    public TeamVenueValidatorTests()
+    {
+        #region *** Mocks ***
+
+        var tenantContextMock = TestMocks.GetTenantContextMock();
+        var appDbMock = TestMocks.GetAppDbMock();
+
+        var teamRepoMock = TestMocks.GetRepo<TeamRepository>();
+        teamRepoMock
+            .Setup(rep => rep.TeamNameExistsAsync(It.IsAny<TeamEntity>(), It.IsAny<CancellationToken>()))
+            .Callback(() => { }).Returns((TeamEntity teamEntity, CancellationToken cancellationToken) =>
+            {
+                return Task.FromResult(teamEntity.Id < 10 ? teamEntity.Name : null);
+            });
+
+        var venueRepoMock = TestMocks.GetRepo<VenueRepository>();
+        venueRepoMock
+            .Setup(rep => rep.IsValidVenueIdAsync(It.IsAny<long>(), It.IsAny<CancellationToken>()))
+            .Callback(() => { }).Returns((long? theValue, CancellationToken cancellationToken) =>
+            {
+                return Task.FromResult(theValue is < 10);
+            });
+
+        appDbMock.Setup(a => a.TeamRepository).Returns(teamRepoMock.Object);
+        appDbMock.Setup(a => a.VenueRepository).Returns(venueRepoMock.Object);
+
+        var dbContextMock = TestMocks.GetDbContextMock();
+        dbContextMock.SetupAppDb(appDbMock);
+            
+        tenantContextMock.SetupDbContext(dbContextMock);
+            
+        _tenantContext = tenantContextMock.Object;
+
+        _appDb = appDbMock.Object;
+
+        #endregion
+    }
+
+    [TestCase(null, true, false)]
+    [TestCase(1, true, true)]
+    [TestCase(null, false, true)]
+    [TestCase(1, false, true)]
+    public async Task Venue_Is_Set_If_Required(long? venueId, bool mustBeSet, bool expected)
+    {
+        var team = new TeamEntity { VenueId = venueId };
+
+        _tenantContext.TournamentContext.TeamRuleSet = new TeamRules {
+            HomeVenue = new HomeVenue { MustBeSet = mustBeSet }
+        };
+        var tv = new TeamVenueValidator(team, _tenantContext);
+
+        var factResult = await tv.CheckAsync(TeamVenueValidator.FactId.VenueIsSetIfRequired, CancellationToken.None);
+
+        Assert.IsNull(factResult.Exception);
+        Assert.That(factResult.Success, Is.EqualTo(expected));
+    }
+
+    [TestCase(1, true)]
+    [TestCase(100, false)] // above 10 is invalid
+    [TestCase(null, false)] // null is invalid
+    public async Task Team_VenueId_Is_Valid(long? venueId, bool expected)
+    {
+        var team = new TeamEntity { VenueId = venueId };
+
+        _tenantContext.TournamentContext.TeamRuleSet = new TeamRules {
+            HomeVenue = new HomeVenue { MustBeSet = false }
+        };
+        var tv = new TeamVenueValidator(team, _tenantContext);
+
+        var factResult = await tv.CheckAsync(TeamVenueValidator.FactId.VenueIsValid, CancellationToken.None);
+
+        Assert.IsNull(factResult.Exception);
+        Assert.That(factResult.Success, Is.EqualTo(expected));
+    }
+}
diff --git a/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs b/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
index 9321a045..9f7faaf1 100644
--- a/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/AbstractValidator.cs
@@ -221,7 +221,7 @@ public virtual async Task<List<Fact<TFactId>>> CheckAsync(CancellationToken canc
             await CheckAsync(fact.Id, cancellationToken);
         }
         // stop after any not successful critical facts
-        if (facts.Any(f => f.IsChecked && !f.Success)) return facts;
+        if (facts.Any(f => f is { IsChecked: true, Success: false })) return facts;
 
         // next process error facts
         facts = GetFactsOfType(FactType.Error).ToList();
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs b/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
index 91cfa4a6..77574c4e 100644
--- a/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamValidator.cs
@@ -62,14 +62,15 @@ private void CreateFacts()
             {
                 Id = FactId.MatchDayOfWeekAndTimeIsSet,
                 FieldNames = new[] {nameof(Model.MatchDayOfWeek), nameof(Model.MatchTime)},
-                Enabled = Data.TournamentContext.TeamRuleSet.HomeMatchTime.IsEditable && Data.TournamentContext.TeamRuleSet.HomeMatchTime.MustBeSet,
+                Enabled = Data.TournamentContext.TeamRuleSet.HomeMatchTime is { IsEditable: true },
                 Type = FactType.Critical,
                 CheckAsync = (cancellationToken) => Task.FromResult(
                     new FactResult
                     {
                         Message = TeamValidatorResource.ResourceManager.GetString(
                             nameof(FactId.MatchDayOfWeekAndTimeIsSet)) ?? string.Empty,
-                        Success = Model.MatchDayOfWeek.HasValue && Model.MatchTime.HasValue
+                        Success = (Data.TournamentContext.TeamRuleSet.HomeMatchTime.MustBeSet && Model is { MatchDayOfWeek: not null, MatchTime: not null })
+                            || (!Data.TournamentContext.TeamRuleSet.HomeMatchTime.MustBeSet && Model is { MatchDayOfWeek: null, MatchTime: null } or { MatchDayOfWeek: not null, MatchTime: not null })
                     })
             });
 
@@ -78,7 +79,7 @@ private void CreateFacts()
             {
                 Id = FactId.DayOfWeekWithinRange,
                 FieldNames = new[] {nameof(Model.MatchDayOfWeek)},
-                Enabled = Data.TournamentContext.TeamRuleSet.HomeMatchTime.IsEditable && Data.TournamentContext.TeamRuleSet.HomeMatchTime.MustBeSet,
+                Enabled = Data.TournamentContext.TeamRuleSet.HomeMatchTime is { IsEditable: true, MustBeSet: true },
                 Type = Data.TournamentContext.TeamRuleSet.HomeMatchTime.ErrorIfNotInDaysOfWeekRange
                     ? FactType.Error
                     : FactType.Warning,
@@ -116,4 +117,4 @@ private void CreateFacts()
                     })
             });
     }
-}
\ No newline at end of file
+}
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamValidatorResource.Designer.cs b/TournamentManager/TournamentManager/ModelValidators/TeamValidatorResource.Designer.cs
index 60d2b544..ef7a7607 100644
--- a/TournamentManager/TournamentManager/ModelValidators/TeamValidatorResource.Designer.cs
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamValidatorResource.Designer.cs
@@ -19,7 +19,7 @@ namespace TournamentManager.ModelValidators {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class TeamValidatorResource {
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidator.cs b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidator.cs
new file mode 100644
index 00000000..16adcec2
--- /dev/null
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidator.cs
@@ -0,0 +1,55 @@
+using TournamentManager.DAL.EntityClasses;
+using TournamentManager.MultiTenancy;
+
+namespace TournamentManager.ModelValidators;
+
+public class TeamVenueValidator : AbstractValidator<TeamEntity, ITenantContext, TeamVenueValidator.FactId>
+{
+    public enum FactId
+    {
+        VenueIsSetIfRequired,
+        VenueIsValid
+    }
+
+    public TeamVenueValidator(TeamEntity model, ITenantContext tenantContext) : base(model, tenantContext)
+    {
+        CreateFacts();
+    }
+
+    private void CreateFacts()
+    {
+        Facts.Add(
+            new Fact<FactId>
+            {
+                Id = FactId.VenueIsSetIfRequired,
+                FieldNames = new[] {nameof(Model.VenueId)},
+                Enabled = true,
+                Type = FactType.Critical,
+                CheckAsync = (cancellationToken) => Task.FromResult(
+                    new FactResult
+                    {
+                        Message = TeamVenueValidatorResource.ResourceManager.GetString(
+                                nameof(FactId.VenueIsSetIfRequired)) ?? string.Empty,
+                        // Venue is set, if required or venue has any value if not required
+                        Success = (Model.VenueId.HasValue && Data.TournamentContext.TeamRuleSet.HomeVenue.MustBeSet)
+                            || (!Data.TournamentContext.TeamRuleSet.HomeVenue.MustBeSet)
+                    })
+            });
+
+        Facts.Add(
+            new Fact<FactId>
+            {
+                Id = FactId.VenueIsValid,
+                FieldNames = new[] {nameof(Model.VenueId)},
+                Enabled = Model.VenueId.HasValue,
+                Type = FactType.Critical,
+                CheckAsync = async (cancellationToken) => new FactResult {
+                    Message = TeamVenueValidatorResource.ResourceManager.GetString(
+                            nameof(FactId.VenueIsValid)) ?? string.Empty,
+                    Success = Model.VenueId.HasValue &&
+                              await Data.DbContext.AppDb.VenueRepository.IsValidVenueIdAsync(Model.VenueId,
+                                  cancellationToken)
+                }
+            });
+    }
+}
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.Designer.cs b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.Designer.cs
new file mode 100644
index 00000000..358baead
--- /dev/null
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TournamentManager.ModelValidators {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class TeamVenueValidatorResource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal TeamVenueValidatorResource() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TournamentManager.ModelValidators.TeamVenueValidatorResource", typeof(TeamVenueValidatorResource).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The team is not assigned a venue.
+        /// </summary>
+        internal static string VenueIsSetIfRequired {
+            get {
+                return ResourceManager.GetString("VenueIsSetIfRequired", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The venue does not exist or is invalid.
+        /// </summary>
+        internal static string VenueIsValid {
+            get {
+                return ResourceManager.GetString("VenueIsValid", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.de.resx b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.de.resx
new file mode 100644
index 00000000..9c170794
--- /dev/null
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.de.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="VenueIsSetIfRequired" xml:space="preserve">
+    <value>Dem Team ist kein Spielort zugeordnet</value>
+  </data>
+  <data name="VenueIsValid" xml:space="preserve">
+    <value>Der Spielort existiert nicht oder ist ungültig</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.resx b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.resx
new file mode 100644
index 00000000..856c5519
--- /dev/null
+++ b/TournamentManager/TournamentManager/ModelValidators/TeamVenueValidatorResource.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="VenueIsSetIfRequired" xml:space="preserve">
+    <value>The team is not assigned a venue</value>
+  </data>
+  <data name="VenueIsValid" xml:space="preserve">
+    <value>The venue does not exist or is invalid</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/TournamentManager/TournamentManager/TournamentManager.csproj b/TournamentManager/TournamentManager/TournamentManager.csproj
index 546ae716..65f5907c 100644
--- a/TournamentManager/TournamentManager/TournamentManager.csproj
+++ b/TournamentManager/TournamentManager/TournamentManager.csproj
@@ -95,6 +95,11 @@ Volleyball League is an open source sports platform that brings everything neces
             <AutoGen>True</AutoGen>
             <DependentUpon>TeamValidatorResource.resx</DependentUpon>
         </Compile>
+        <Compile Update="ModelValidators\TeamVenueValidatorResource.Designer.cs">
+          <DesignTime>True</DesignTime>
+          <AutoGen>True</AutoGen>
+          <DependentUpon>TeamVenueValidatorResource.resx</DependentUpon>
+        </Compile>
         <Compile Update="ModelValidators\VenueValidatorResource.Designer.cs">
             <DesignTime>True</DesignTime>
             <AutoGen>True</AutoGen>
@@ -135,6 +140,10 @@ Volleyball League is an open source sports platform that brings everything neces
             <LastGenOutput>TeamInRoundValidatorResource.Designer.cs</LastGenOutput>
             <Generator>ResXFileCodeGenerator</Generator>
         </EmbeddedResource>
+        <EmbeddedResource Update="ModelValidators\TeamVenueValidatorResource.resx">
+          <Generator>ResXFileCodeGenerator</Generator>
+          <LastGenOutput>TeamVenueValidatorResource.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
         <EmbeddedResource Update="ModelValidators\VenueValidatorResource.resx">
             <LastGenOutput>VenueValidatorResource.Designer.cs</LastGenOutput>
             <Generator>PublicResXFileCodeGenerator</Generator>