diff --git a/module/gitlab/css/common.css b/module/gitlab/css/common.css
new file mode 100644
index 0000000000..162e6d9854
--- /dev/null
+++ b/module/gitlab/css/common.css
@@ -0,0 +1 @@
+#publicTip {padding-left: 10px;}
diff --git a/module/gitlab/js/creategroup.js b/module/gitlab/js/creategroup.js
index b1f77fb1f2..f25ff5dff0 100644
--- a/module/gitlab/js/creategroup.js
+++ b/module/gitlab/js/creategroup.js
@@ -5,7 +5,7 @@ $(function()
     $('input:radio[name="visibility"]').change(function()
     {
         var visibility = $('input:radio[name="visibility"]:checked').val();
-        if(visibility == 'public') $('#publicTip').removeClass('hidden');
-        if(visibility != 'public') $('#publicTip').addClass('hidden');
+        if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+        if(visibility != 'public') $('#publicTip').remove();
     })
 })
diff --git a/module/gitlab/js/createproject.js b/module/gitlab/js/createproject.js
index cea9217cb5..1bc0d278f3 100644
--- a/module/gitlab/js/createproject.js
+++ b/module/gitlab/js/createproject.js
@@ -7,7 +7,7 @@ $(function()
     $('input:radio[name="visibility"]').change(function()
     {
         var visibility = $('input:radio[name="visibility"]:checked').val();
-        if(visibility == 'public') $('#publicTip').removeClass('hidden');
-        if(visibility != 'public') $('#publicTip').addClass('hidden');
+        if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+        if(visibility != 'public') $('#publicTip').remove();
     })
 })
diff --git a/module/gitlab/js/editgroup.js b/module/gitlab/js/editgroup.js
index b1f77fb1f2..a5ce831981 100644
--- a/module/gitlab/js/editgroup.js
+++ b/module/gitlab/js/editgroup.js
@@ -1,11 +1,13 @@
 $(function()
 {
+    if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+
     $("input[type='radio'][value='public']").parent().parent().css("margin-bottom", "0px");
 
     $('input:radio[name="visibility"]').change(function()
     {
         var visibility = $('input:radio[name="visibility"]:checked').val();
-        if(visibility == 'public') $('#publicTip').removeClass('hidden');
-        if(visibility != 'public') $('#publicTip').addClass('hidden');
+        if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+        if(visibility != 'public') $('#publicTip').remove();
     })
 })
diff --git a/module/gitlab/js/editproject.js b/module/gitlab/js/editproject.js
index c3479c94e4..eb299a8bd7 100644
--- a/module/gitlab/js/editproject.js
+++ b/module/gitlab/js/editproject.js
@@ -1,9 +1,11 @@
 $(function()
 {
+    if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+
     $('input:radio[name="visibility"]').change(function()
     {
         var visibility = $('input:radio[name="visibility"]:checked').val();
-        if(visibility == 'public') $('#publicTip').removeClass('hidden');
-        if(visibility != 'public') $('#publicTip').addClass('hidden');
+        if(visibility == 'public') $("#visibilitypublic").parent().append(publicTip);
+        if(visibility != 'public') $('#publicTip').remove();
     })
 })
diff --git a/module/gitlab/view/creategroup.html.php b/module/gitlab/view/creategroup.html.php
index 9dcad94481..eb040c8556 100644
--- a/module/gitlab/view/creategroup.html.php
+++ b/module/gitlab/view/creategroup.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php $publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->group->publicTip . '</span>';?>
+<?php js::set('publicTip', $publicTip);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>
@@ -40,10 +42,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->group->visibility;?></th>
-            <td colspan='2'>
-              <?php echo nl2br(html::radio('visibility', $lang->gitlab->group->visibilityList, 'private', "", 'block'));?>
-              <span id='publicTip' class='text-danger hidden'><?php echo $lang->gitlab->group->publicTip;?></span>
-            </td>
+            <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->group->visibilityList, 'private', "", 'block'));?></td>
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->group->permission;?></th>
diff --git a/module/gitlab/view/createproject.html.php b/module/gitlab/view/createproject.html.php
index 23bf303de8..59c3fb620a 100644
--- a/module/gitlab/view/createproject.html.php
+++ b/module/gitlab/view/createproject.html.php
@@ -11,6 +11,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php $publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->project->publicTip . '</span>';?>
+<?php js::set('publicTip', $publicTip);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>
@@ -47,10 +49,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->project->visibility;?></th>
-            <td colspan='2'>
-              <?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, 'private', "", 'block'));?>
-              <span id='publicTip' class='text-danger hidden'><?php echo $lang->gitlab->project->publicTip;?></span>
-            </td>
+            <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, 'private', "", 'block'));?></td>
           </tr>
           <tr>
             <th></th>
diff --git a/module/gitlab/view/editgroup.html.php b/module/gitlab/view/editgroup.html.php
index e2ec08fcfb..589f5ba5c4 100644
--- a/module/gitlab/view/editgroup.html.php
+++ b/module/gitlab/view/editgroup.html.php
@@ -11,6 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php $publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->group->publicTip . '</span>';?>
+<?php js::set('publicTip', $publicTip);?>
+<?php js::set('visibility', $group->visibility);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>
@@ -42,10 +45,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->group->visibility;?></th>
-            <td colspan='2'>
-              <?php echo nl2br(html::radio('visibility', $lang->gitlab->group->visibilityList, $group->visibility, "", 'block'));?>
-              <span id='publicTip' class='text-danger <?php echo $group->visibility != 'public' ? "hidden" : '';?>'><?php echo $lang->gitlab->group->publicTip;?></span>
-            </td>
+            <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->group->visibilityList, $group->visibility, "", 'block'));?></td>
           </tr>
           <tr>
             <th></th>
diff --git a/module/gitlab/view/editproject.html.php b/module/gitlab/view/editproject.html.php
index c6109c15be..af366d1ccd 100644
--- a/module/gitlab/view/editproject.html.php
+++ b/module/gitlab/view/editproject.html.php
@@ -11,6 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php $publicTip = "<span id='publicTip' class='text-danger'>" . $lang->gitlab->project->publicTip . '</span>';?>
+<?php js::set('publicTip', $publicTip);?>
+<?php js::set('visibility', $project->visibility);?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
     <div class='center-block'>
@@ -34,10 +37,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->gitlab->project->visibility;?></th>
-            <td colspan='2'>
-              <?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, $project->visibility, "", 'block'));?>
-              <span id='publicTip' class='text-danger <?php echo $project->visibility != 'public' ? "hidden" : '';?>'><?php echo $lang->gitlab->project->publicTip;?></span>
-            </td>
+            <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, $project->visibility, "", 'block'));?></td>
           </tr>
           <tr>
             <th></th>