diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index d5cb3f620b1626fa98edfa3c59c5f0127174b722..32c143cae16706f0de3e61ced452fef7a6bcbe59 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -50,7 +50,7 @@ class @DueDateSelect
               $selectbox.hide()
             $value.css('display', '')
 
-            cssClass = if mediumDate is "No due date" then 'no-value' else 'bold'
+            cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value'
             $valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>")
             $sidebarValue.html(mediumDate)
 
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 6dff9fc4fd09eb84979218665683d5afbf21bc2c..5df3af6091a85897eb92c0020912ee355d53d872 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -39,7 +39,7 @@ class @LabelsSelect
             </a>
             <% }); %>'
         )
-        labelNoneHTMLTemplate = _.template('<span class="no-value">None</span>')
+        labelNoneHTMLTemplate = '<span class="no-value">None</span>'
 
       if newLabelField.length
 
@@ -142,7 +142,7 @@ class @LabelsSelect
             template = labelHTMLTemplate(data)
             labelCount = data.labels.length
           else
-            template = labelNoneHTMLTemplate()
+            template = labelNoneHTMLTemplate
           $value
             .removeAttr('style')
             .html(template)