diff --git a/rowers/templates/privacypolicy.html b/rowers/templates/privacypolicy.html
index ee7ec1a2..65906b84 100644
--- a/rowers/templates/privacypolicy.html
+++ b/rowers/templates/privacypolicy.html
@@ -178,6 +178,20 @@
     may be available around the world.
     You agree to such cross-border transfers of personal information.
   </p>
+
+  <h3>Team Functionality</h3>
+
+<p>
+  On rowsandall.com, users with the paid "Coach" plan can establish teams and invite other users to become part of the team. The purpose
+  of a team is to share workout and training plan data between the coach and the team members. In terms of sharing behavior, there are two types of teams:
+  <ul>
+    <li>"All Members" - This is the default team type. All members can see workouts of all other members, except those workouts that the members have
+      marked as "private".
+    <li>"Coach Only" - With this setting, each individual team member is sharing his workout data only with the team manager. Other members cannot see
+      his workouts.
+  </ul>
+  The sharing behavior is chosen by the team member when he establishes the team and can be changed during the existence of the team.
+</p>
   
   <p>
     By accepting an "invitation" to become a member of a team, or by requesting to become part of a team, you agree to automatically
@@ -192,7 +206,34 @@
     favorite charts, export settings, workflow layout, or secret tokens. Also, the team manager is not able to download all your data,
     not can he deactivate or delete your account.
   </p>
-  
+
+<p>
+  Each team member is bound by this privacy policy and the GDPR regulation of the European Union regarding the personal data of other team
+  members that he has access to. By accepting an invitation to a team, the new member agrees to limit the use of these data strictly to the
+  allowed use according to this privacy policy and the GDPR. 
+  </p>
+
+  <p>
+    Team managers can access requests of users to be added to one of their teams. By accepting the invitation, the manager accepts the responsibilities
+    and duties associated with access to personal data of the new team member. He is bound by this privacy policy and the GDPR regulation
+    of the European Union regarding the personal data that he has access to.
+  </p>
+
+<p>
+  In case that a team manager wants to change the sharing behavior of one of his teams from "Coach Only" to "All Members", he has to inform all
+  impacted team members in due time. He shall give team members a minimum of three days to decide whether they agree with the new sharing policy, and
+  collect the consent of the team members with the new sharing policy. The team manager must remove team members who did not give their active consent
+  to the new policy from his team. If a team member has not responded within 7 days of being notified, the team manager will understand this as "no consent"
+  and remove the team member.
+</p>
+
+<p>
+  When notified of a change in team sharing behavior by the team manager, the team member has to decide whether he agrees. In case of disagreement, he shall
+  revoke his team membership within less than 7 days of being notified. 
+</p>
+
+  <h3>Third Party Sharing</h3>
+    
   <p>
     This site offers the possiblity to synchronize your data with other fitness sites. By clicking on the share or connect button (link, or
     equivalent) you agree to share information between rowsandall.com and the other website. Rowsandall.com is not responsible for the privacy
diff --git a/rowers/templates/team.html b/rowers/templates/team.html
index cc53418c..2d992033 100644
--- a/rowers/templates/team.html
+++ b/rowers/templates/team.html
@@ -32,6 +32,13 @@
   {% elif hasrequested %}
   <p>You have requested access to this team</p>
   {% else %}
+  <p>You can request access to this team. By requesting access, you
+    agree to the <a href="/rowers/legal">Privacy Policy</a> regarding
+    team functionality. You agree to share your workout data (except
+    workouts marked as "private") to all team members and the team manager.
+    You also grant the team manager access to your heart rate and power
+    zone settings, as well as your functional threshold information. You
+    are granting the team manager permission to edit your workouts.</p>
   <div class="grid_2 suffix_10 alpha tooltip">
     <a class="button green small" href="/rowers/team/{{ team.id }}/requestmembership/{{ user.id }}">Join</a>
     <span class="tooltiptext">A request will be sent to the team manager</span>
diff --git a/rowers/templates/teams.html b/rowers/templates/teams.html
index 9971a001..af2bc40e 100644
--- a/rowers/templates/teams.html
+++ b/rowers/templates/teams.html
@@ -111,7 +111,11 @@
       a team invite, you are agreeing with the sharing 
       of personal data between team members and coaches according to
       our <a href="/rowers/legal">privacy policy</a>.
-      </p>
+    </p>
+
+    <p>As a team manager, by accepting a team invite, you are agreeing
+      with <a href="/rowers/legal">privacy policy</a> regarding teams and
+      personal data owned by team members.</p>
 
       <table width="90%" class="listtable">
         <thead>
diff --git a/rowers/views.py b/rowers/views.py
index dfd3a102..0d94704c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12190,8 +12190,13 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
 
 
     teams = Team.objects.filter(manager=request.user)
-    teamchoices = [(team.id, team.name) for team in teams]
-    teaminitial = [str(teams[0].id)]
+    if len(teams)>0:
+        teamchoices = [(team.id, team.name) for team in teams]
+        teaminitial = [str(teams[0].id)]
+    else:
+        messages.info(request,"You have no teams established yet. We are redirecting you to the Team Management page.")
+        url = reverse(rower_teams_view)
+        return HttpResponseRedirect(url)
 
     startdate,enddate = get_dates_timeperiod(timeperiod)