diff --git a/lms/djangoapps/certificates/queue.py b/lms/djangoapps/certificates/queue.py
index dc3c173b33..105eab04e4 100644
--- a/lms/djangoapps/certificates/queue.py
+++ b/lms/djangoapps/certificates/queue.py
@@ -178,7 +178,7 @@ class XQueueCertInterface(object):
             self.request.user = student
             self.request.session = {}
 
-            course_name = course.display_name or course_id
+            course_name = course.display_name or course_id.to_deprecated_string()
             is_whitelisted = self.whitelist.filter(user=student, course_id=course_id, whitelist=True).exists()
             grade = grades.grade(student, self.request, course)
             enrollment_mode = CourseEnrollment.enrollment_mode_for_user(student, course_id)
diff --git a/lms/djangoapps/certificates/views.py b/lms/djangoapps/certificates/views.py
index 7514f67e71..ed5f1e6721 100644
--- a/lms/djangoapps/certificates/views.py
+++ b/lms/djangoapps/certificates/views.py
@@ -31,13 +31,13 @@ def request_certificate(request):
             xqci = XQueueCertInterface()
             username = request.user.username
             student = User.objects.get(username=username)
-            course_id = request.POST.get('course_id')
-            course = modulestore().get_instance(course_id, CourseDescriptor.id_to_location(course_id), depth=2)
+            course_key = SlashSeparatedCourseKey.from_deprecated_string(request.POST.get('course_id'))
+            course = modulestore().get_course(course_key, depth=2)
 
-            status = certificate_status_for_student(student, course_id)['status']
+            status = certificate_status_for_student(student, course_key)['status']
             if status in [CertificateStatuses.unavailable, CertificateStatuses.notpassing, CertificateStatuses.error]:
-                logger.info('Grading and certification requested for user {} in course {} via /request_certificate call'.format(username, course_id))
-                status = xqci.add_cert(student, course_id, course=course)
+                logger.info('Grading and certification requested for user {} in course {} via /request_certificate call'.format(username, course_key))
+                status = xqci.add_cert(student, course_key, course=course)
             return HttpResponse(json.dumps({'add_status': status}), mimetype='application/json')
         return HttpResponse(json.dumps({'add_status': 'ERRORANONYMOUSUSER'}), mimetype='application/json')