diff --git a/README.rst b/README.rst
index 9cb5573..85a4427 100644
--- a/README.rst
+++ b/README.rst
@@ -163,6 +163,8 @@ Template settings
* ``CAS_LOGO_URL``: URL to the logo showed in the up left corner on the default
templates. Set it to ``False`` to disable it.
+* ``CAS_FAVICON_URL``: URL to the favicon (shortcut icon) used by the default templates.
+ Default is a key icon. Set it to ``False`` to disable it.
* ``CAS_COMPONENT_URLS``: URLs to css and javascript external components. It is a dictionnary
and it must have the five following keys: ``"bootstrap3_css"``, ``"bootstrap3_js"``,
``"html5shiv"``, ``"respond"``, ``"jquery"``. The default is::
diff --git a/cas_server/default_settings.py b/cas_server/default_settings.py
index 69a2fdf..ed9efc2 100644
--- a/cas_server/default_settings.py
+++ b/cas_server/default_settings.py
@@ -18,6 +18,8 @@ from importlib import import_module
#: URL to the logo showed in the up left corner on the default templates.
CAS_LOGO_URL = static("cas_server/logo.png")
+#: URL to the favicon (shortcut icon) used by the default templates. Default is a key icon.
+CAS_FAVICON_URL = static("cas_server/favicon.ico")
#: URLs to css and javascript external components.
CAS_COMPONENT_URLS = {
"bootstrap3_css": "//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css",
diff --git a/cas_server/templates/cas_server/base.html b/cas_server/templates/cas_server/base.html
index 5abc8bd..87b9a6d 100644
--- a/cas_server/templates/cas_server/base.html
+++ b/cas_server/templates/cas_server/base.html
@@ -14,7 +14,7 @@
-
+ {% if settings.CAS_FAVICON_URL %}{% endif %}