diff --git a/pelican/settings.py b/pelican/settings.py
index 6ed76f46..d62acf42 100644
--- a/pelican/settings.py
+++ b/pelican/settings.py
@@ -37,10 +37,10 @@ _DEFAULT_CONFIG = {'PATH': None,
                    'PAGE_LANG_SAVE_AS': 'pages/{slug}-{lang}.html',
                    'CATEGORY_URL': 'category/{name}.html',
                    'CATEGORY_SAVE_AS': 'category/{name}.html',
-                   'TAG_URL': 'tag/{name}.html',
-                   'TAG_SAVE_AS': 'tag/{name}.html',
-                   'AUTHOR_URL': u'author/{name}.html',
-                   'AUTHOR_SAVE_AS': u'author/{name}.html',
+                   'TAG_URL': 'tag/{slug}.html',
+                   'TAG_SAVE_AS': 'tag/{slug}.html',
+                   'AUTHOR_URL': u'author/{slug}.html',
+                   'AUTHOR_SAVE_AS': u'author/{slug}.html',
                    'RELATIVE_URLS': True,
                    'DEFAULT_LANG': 'en',
                    'TAG_CLOUD_STEPS': 4,