diff --git a/README.asciidoc b/README.asciidoc
index 3cca31379..d6a01f1b7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -130,8 +130,8 @@ Contributors, sorted by the number of commits in descending order:
 // QUTE_AUTHORS_START
 * Florian Bruhin
 * Claude
-* John ShaggyTwoDope Jenkins
 * Peter Vilim
+* John ShaggyTwoDope Jenkins
 * rikn00
 * Martin Zimmermann
 * Joel Torstensson
diff --git a/qutebrowser/completion/models/completion.py b/qutebrowser/completion/models/completion.py
index e2940de92..09263970a 100644
--- a/qutebrowser/completion/models/completion.py
+++ b/qutebrowser/completion/models/completion.py
@@ -116,8 +116,10 @@ class SettingValueCompletionModel(base.BaseCompletionModel):
             value = '""'
         self.cur_item, _descitem, _miscitem = self.new_item(cur_cat, value,
                                                             "Current value")
-        self.new_item(cur_cat, configdata.DATA[section][option].default(),
-                      "Default value")
+        default_value = configdata.DATA[section][option].default()
+        if not default_value:
+            default_value = '""'
+        self.new_item(cur_cat, default_value, "Default value")
         if hasattr(configdata.DATA[section], 'valtype'):
             # Same type for all values (ValueList)
             vals = configdata.DATA[section].valtype.complete()