diff --git a/lms/djangoapps/teams/migrations/0002_slug_field_ids.py b/lms/djangoapps/teams/migrations/0002_slug_field_ids.py
new file mode 100644
index 0000000000..c44314da5b
--- /dev/null
+++ b/lms/djangoapps/teams/migrations/0002_slug_field_ids.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.25 on 2019-10-22 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('teams', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='courseteam',
+            name='discussion_topic_id',
+            field=models.SlugField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='courseteam',
+            name='team_id',
+            field=models.SlugField(max_length=255, unique=True),
+        ),
+    ]
diff --git a/lms/djangoapps/teams/models.py b/lms/djangoapps/teams/models.py
index 30348961d6..aa3afe3025 100644
--- a/lms/djangoapps/teams/models.py
+++ b/lms/djangoapps/teams/models.py
@@ -119,8 +119,8 @@ class CourseTeam(models.Model):
     class Meta(object):
         app_label = "teams"
 
-    team_id = models.CharField(max_length=255, unique=True)
-    discussion_topic_id = models.CharField(max_length=255, unique=True)
+    team_id = models.SlugField(max_length=255, unique=True)
+    discussion_topic_id = models.SlugField(max_length=255, unique=True)
     name = models.CharField(max_length=255, db_index=True)
     course_id = CourseKeyField(max_length=255, db_index=True)
     topic_id = models.CharField(max_length=255, db_index=True, blank=True)