diff --git a/feathers/link/link.php b/feathers/link/link.php
index e4f5c2004b..b4b8cfbfee 100755
--- a/feathers/link/link.php
+++ b/feathers/link/link.php
@@ -1,14 +1,15 @@
 <?php
     class Link extends Feathers implements Feather {
         public function __init() {
+            $this->setField(array("attr" => "name",
+                                  "type" => "text",
+                                  "label" => __("Title", "link"),
+                                  "optional" => true,
+                                  "bookmarklet" => "title"));
             $this->setField(array("attr" => "source",
                                   "type" => "text",
                                   "label" => __("URL", "link"),
                                   "bookmarklet" => "url"));
-            $this->setField(array("attr" => "name",
-                                  "type" => "text",
-                                  "label" => __("Name", "link"),
-                                  "bookmarklet" => "title"));
             $this->setField(array("attr" => "description",
                                   "type" => "text_block",
                                   "label" => __("Description", "link"),
diff --git a/themes/stardust/feathers/link.twig b/themes/stardust/feathers/link.twig
index 77f2e850fc..8badefd0eb 100644
--- a/themes/stardust/feathers/link.twig
+++ b/themes/stardust/feathers/link.twig
@@ -1,6 +1,6 @@
 {% extends "content/post.twig" %}
 
 {% block content %}
-                        <h2 class="title"><a href="$post.source" class="link">$post.name</a></h2>
+                        <h2 class="title"><a href="$post.source" class="link">${ "%s" | format(post.name | fallback(post.source)) }</a></h2>
                         ${ post.description | read_more }
 {% endblock %}