diff --git a/app/views/groups/_create_chat_team.html.haml b/app/views/groups/_create_chat_team.html.haml
index b2b5a2090f9..c06a7a23346 100644
--- a/app/views/groups/_create_chat_team.html.haml
+++ b/app/views/groups/_create_chat_team.html.haml
@@ -1,18 +1,18 @@
 .form-group
-  = f.label :name, class: 'control-label' do
+  = f.label :create_chat_team, class: 'control-label' do
     %span.mattermost-icon
       = custom_icon('icon_mattermost')
     Mattermost
   .col-sm-10
     .checkbox
-      = f.label :name do
-        = f.check_box :create_chat_team, checked: true
+      = f.label :create_chat_team do
+        = f.check_box :create_chat_team, checked: @group.chat_team
         Link the group to a new Mattermost team
 
 .form-group
   = f.label :chat_team, class: 'control-label' do
     Chat Team name
   .col-sm-10
-    = f.text_field :chat_team, placeholder: @group.name, class: 'form-control mattermost-team-name'
-    Leave blank to match your group name
-
+    = f.text_field :chat_team, placeholder: @group.chat_team, class: 'form-control mattermost-team-name'
+    %small
+      Leave blank to match your group name