diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py
index 2d57fdbd6..57fd17a7c 100644
--- a/ietf/secr/meetings/tests.py
+++ b/ietf/secr/meetings/tests.py
@@ -92,7 +92,7 @@ class SecrMeetingTestCase(TestCase):
         new_meeting = Meeting.objects.get(number=number)
         
         self.assertTrue(new_meeting.schedule)
-        self.assertEqual(new_meeting.schedule.name, 'secretary1')
+        self.assertEqual(new_meeting.schedule.name, 'sec-retary-1')
         self.assertTrue(new_meeting.schedule.base)
         self.assertEqual(new_meeting.schedule.base.name, 'base')
         self.assertEqual(new_meeting.attendees, None)
diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py
index c8ec7938e..bb599d0e0 100644
--- a/ietf/secr/meetings/views.py
+++ b/ietf/secr/meetings/views.py
@@ -10,6 +10,7 @@ from django.contrib import messages
 from django.db.models import Max
 from django.forms.models import inlineformset_factory
 from django.shortcuts import render, get_object_or_404, redirect
+from django.utils.text import slugify
 
 import debug                            # pyflakes:ignore
 
@@ -227,7 +228,7 @@ def add(request):
             )
 
             schedule = Schedule.objects.create(meeting = meeting,
-                                               name    = "{}1".format(request.user.username),
+                                               name    = "%s-1" % slugify(request.user.person.plain_name()),
                                                owner   = request.user.person,
                                                visible = True,
                                                public  = True,
diff --git a/ietf/secr/templates/meetings/view.html b/ietf/secr/templates/meetings/view.html
index 3564c3782..15f217929 100644
--- a/ietf/secr/templates/meetings/view.html
+++ b/ietf/secr/templates/meetings/view.html
@@ -48,7 +48,9 @@
              </select>
            </form>
          </li>
+         {% if meeting.schedule %}
          <li><button onclick="window.location='{% url "ietf.secr.meetings.views.rooms" meeting_id=meeting.number schedule_name=meeting.schedule.name %}'">Official Schedule</button></li>
+         {% endif %}
        </ul>
       </div> <!-- button-group -->