diff --git a/src/client/app/tmpl/support.html b/src/client/app/tmpl/support.html
index 8997db5..9939f05 100644
--- a/src/client/app/tmpl/support.html
+++ b/src/client/app/tmpl/support.html
@@ -1,5 +1,6 @@
 <h4><a href="javascript:history.back()"><i class="fas fa-chevron-left"></i></a> <%= _lc( 'SUPPORT' ) %></h4>
 <div class="card">
+    <div><%= app.model.SessionUser.isAdminOfAnyTeam() %></div>
     <form class="form"
           data-id="form-support">
         <div class="card-header">
@@ -13,6 +14,7 @@
                 <label for="select-reason">
                     <%= _lc( 'SUPPORT_REASON' ) %>
                 </label>
+
                 <select class="form-control custom-select"
                         id="select-reason"
                         data-id="select-reason">
@@ -46,4 +48,16 @@
             </button>
         </div>
     </form>
+    <% } else { %>
+<!--    @Flo: bitte stylen -->
+        <div class="card-header">
+            <i class="far fa-life-ring"></i>&nbsp;<%= _lc( 'SUPPORT_HEADLINE' ) %>
+        </div>
+        <p>Wenn Du Kontakt mit dem Gruppeninhaber aufnehmen möchtest, gehe bitte wie folgt vor: </br>
+            Allgemeine Frage: Nutze bitte die Kontaktoptionen auf der Gruppenübersicht </br>
+            Frage zu einem Termin: Verwende den Chat für einen bestimmten Termin über die Terminübersicht.</br>
+            <a href="#/groups"><%= _lc( 'GROUP_OVERVIEW' ) %></a>
+            <a href="#/home"><%= _lc( 'BTN_BACK_TO_HOME' ) %></a>
+        </p>
+    <% } %>
 </div>
\ No newline at end of file
diff --git a/src/server/server/control/TB_Server_Control_Appointment.php b/src/server/server/control/TB_Server_Control_Appointment.php
index 4e764c2..3246064 100644
--- a/src/server/server/control/TB_Server_Control_Appointment.php
+++ b/src/server/server/control/TB_Server_Control_Appointment.php
@@ -67,13 +67,13 @@ class TB_Server_Control_Appointment {
             $comment = NULL;
         }
 
-// Link replacements
-//        if ( 0 === mb_strlen( $comment ) )
-//        {
-//            $comment = NULL;
-//        } else {
-//            $comment = TB_Server_Utils_Helper::makeUrltoLink($comment);
-//        }
+        // Link replacements
+        if ( 0 === mb_strlen( $comment ) )
+        {
+            $comment = NULL;
+        } else {
+            $comment = TB_Server_Utils_Helper::makeUrltoLink($comment);
+        }
 
         $visibility = $params->get( 'visibility', TB_Shared_Ent_TeamData_Appointment::VISIBLE_ALL );
 
@@ -414,13 +414,13 @@ class TB_Server_Control_Appointment {
                 $comment = NULL;
             }
 
-// Link replacements
-//            if ( 0 === mb_strlen( $comment ) )
-//            {
-//                $comment = NULL;
-//            } else {
-//                $comment = TB_Server_Utils_Helper::makeUrltoLink($comment);
-//            }
+            // Link replacements
+            if ( 0 === mb_strlen( $comment ) )
+            {
+                $comment = NULL;
+            } else {
+                $comment = TB_Server_Utils_Helper::makeUrltoLink($comment);
+            }
 
             $visibility = $params->get( 'visibility', TB_Shared_Ent_TeamData_Appointment::VISIBLE_ALL );