diff --git a/beetsplug/embyupdate.py b/beetsplug/embyupdate.py
index 6f74b4452..5c731954b 100644
--- a/beetsplug/embyupdate.py
+++ b/beetsplug/embyupdate.py
@@ -153,7 +153,7 @@ class EmbyUpdate(BeetsPlugin):
             u'host': u'http://localhost',
             u'port': 8096,
             u'apikey': None,
-            u'password': None
+            u'password': None,
         })
 
         self.register_listener('database_change', self.listen_for_db_change)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 28605fba2..69ee77e8c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -47,7 +47,8 @@ Fixes:
   :bug:`2302`
 * :doc:`/plugins/lyrics`: The plugin now reports a beets-specific User-Agent
   header when requesting lyrics. :bug:`2357`
-* :doc:`/plugins/embyupdate`: Fix a bug that apikey and password is needed in config.
+* :doc:`/plugins/embyupdate`: The plugin now checks whether an API key or a
+  password is provided in the configuration.
 
 For plugin developers: new importer prompt choices (see :ref:`append_prompt_choices`), you can now provide new candidates for the user to consider.
 
diff --git a/docs/plugins/embyupdate.rst b/docs/plugins/embyupdate.rst
index 8dbb7c1db..00373b98c 100644
--- a/docs/plugins/embyupdate.rst
+++ b/docs/plugins/embyupdate.rst
@@ -3,7 +3,7 @@ EmbyUpdate Plugin
 
 ``embyupdate`` is a plugin that lets you automatically update `Emby`_'s library whenever you change your beets library.
 
-To use ``embyupdate`` plugin, enable it in your configuration (see :ref:`using-plugins`). Then, you'll probably want to configure the specifics of your Emby server. You can do that using an ``emby:`` section in your ``config.yaml``, which looks like this::
+To use ``embyupdate`` plugin, enable it in your configuration (see :ref:`using-plugins`). Then, you'll want to configure the specifics of your Emby server. You can do that using an ``emby:`` section in your ``config.yaml``, which looks like this::
 
     emby:
         host: localhost