diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py
index 2e3d80e9f1..da24277a1b 100644
--- a/common/test/acceptance/pages/lms/instructor_dashboard.py
+++ b/common/test/acceptance/pages/lms/instructor_dashboard.py
@@ -1415,9 +1415,9 @@ class CertificatesPage(PageObject):
         self.get_selector('#invalidate-certificate').click()
 
     @property
-    def self_generation_certificate_enabled_button(self):
+    def self_generated_certificate_enabled_button(self):
         """
-        Returns the "Self Generation Certificate Enable" button.
+        Returns the "Self Generated Certificate Enable" button.
         """
         return self.get_selector('#enable-certificates-submit')
 
diff --git a/common/test/acceptance/tests/lms/test_certificate_web_view.py b/common/test/acceptance/tests/lms/test_certificate_web_view.py
index f34d8d4a83..5e47c441ed 100644
--- a/common/test/acceptance/tests/lms/test_certificate_web_view.py
+++ b/common/test/acceptance/tests/lms/test_certificate_web_view.py
@@ -1,13 +1,6 @@
 """
 Acceptance tests for the certificate web view feature.
 """
-from common.test.acceptance.tests.helpers import (
-    UniqueCourseTest,
-    EventsTestMixin,
-    load_data_str,
-    get_element_padding,
-    get_modal_alert,
-)
 from nose.plugins.attrib import attr
 from common.test.acceptance.fixtures.certificates import CertificateConfigFixture
 from common.test.acceptance.fixtures.course import CourseFixture, CourseUpdateDesc, XBlockFixtureDesc
@@ -21,7 +14,13 @@ from common.test.acceptance.pages.lms.tab_nav import TabNavPage
 from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
 from common.test.acceptance.tests.helpers import disable_animations
 from common.test.acceptance.pages.common.logout import LogoutPage
-
+from common.test.acceptance.tests.helpers import (
+    UniqueCourseTest,
+    EventsTestMixin,
+    load_data_str,
+    get_element_padding,
+    get_modal_alert,
+)
 
 @attr(shard=5)
 class CertificateWebViewTest(EventsTestMixin, UniqueCourseTest):
@@ -183,7 +182,7 @@ class CertificateProgressPageTest(UniqueCourseTest):
 
     def log_in_as_staff(self):
         """
-        Log in as a staff.
+        Log in as a staff user.
         """
         AutoAuthPage(
             self.browser,
@@ -209,7 +208,7 @@ class CertificateProgressPageTest(UniqueCourseTest):
         """
         self.cert_fixture.install()
 
-        self.enable_self_generation_certificates()
+        self.enable_self_generated_certificates()
 
         self.log_in_as_unique_user()
         self.complete_course_problems()
@@ -272,17 +271,18 @@ class CertificateProgressPageTest(UniqueCourseTest):
         self.courseware_page.q(css='button.submit').click()
         self.courseware_page.wait_for_ajax()
 
-    def enable_self_generation_certificates(self):
+    def enable_self_generated_certificates(self):
         """
-        Enable self-generation certificates for instructor-paced courses.
-        By default, it is disabled. (EDUCATOR-394)
+        Self-generated certificates should be enabled for the presence of View
+        Certificate button on Course Progress menu. By default, it is disabled
+        for instructor-paced courses. (EDUCATOR-394)
         """
         self.log_in_as_staff()
 
         self.instructor_dashboard_page.visit()
         self.certificates_section = self.instructor_dashboard_page.select_certificates()
         disable_animations(self.certificates_section)
-        self.certificates_section.self_generation_certificate_enabled_button.click()
+        self.certificates_section.self_generated_certificate_enabled_button.click()
         alert = get_modal_alert(self.certificates_section.browser)
         alert.accept()
         self.certificates_section.wait_for_ajax()
diff --git a/lms/djangoapps/certificates/models.py b/lms/djangoapps/certificates/models.py
index bbed49f87f..9a42fc1048 100644
--- a/lms/djangoapps/certificates/models.py
+++ b/lms/djangoapps/certificates/models.py
@@ -897,6 +897,10 @@ class CertificateGenerationCourseSetting(TimeStampedModel):
             with transaction.atomic():
                 certificate_generation_course_setting.save()
         except IntegrityError:
+            if is_enabled:
+                LOGGER.exception("Cannot enable self-generated certificates for course %s.", unicode(course_key))
+            else:
+                LOGGER.exception("Cannot disable self-generated certificates for course %s.", unicode(course_key))
             pass
 
 
diff --git a/lms/djangoapps/certificates/tests/test_signals.py b/lms/djangoapps/certificates/tests/test_signals.py
index 16106d4d2d..99e05f75a6 100644
--- a/lms/djangoapps/certificates/tests/test_signals.py
+++ b/lms/djangoapps/certificates/tests/test_signals.py
@@ -22,7 +22,8 @@ class SelfGeneratedCertsSignalTest(ModuleStoreTestCase):
         CertificateGenerationConfiguration.objects.create(enabled=True)
 
     def test_cert_generation_enabled_for_self_paced(self):
-        """ Verify the signal enable the self-generated certificates for
+        """
+        Verify the signal enables the self-generated certificates for
         self-paced courses.
         """
         self.assertFalse(certs_api.cert_generation_enabled(self.course.id))
@@ -31,7 +32,8 @@ class SelfGeneratedCertsSignalTest(ModuleStoreTestCase):
         self.assertTrue(certs_api.cert_generation_enabled(self.course.id))
 
     def test_cert_generation_disabled_for_instructor_paced(self):
-        """ Verify the signal disable the self-generated certificates for
+        """
+        Verify the signal disables the self-generated certificates for
         instructor-paced courses.
         """
         self.course.self_paced = False
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index 8be980bd52..debda49780 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -1349,7 +1349,8 @@ class ProgressPageTests(ModuleStoreTestCase):
         self.course.save()
         self.store.update_item(self.course, self.user.id)
 
-        # verify that certificate web view button disappears for disabled self-generation certificates
+        # verify that certificate web view button disappears if self-generated certificates
+        # are disabled
         resp = self._get_progress_page()
         self.assertNotContains(resp, u"View Certificate")