diff --git a/assets/scripts/app/helpers/handlebars.coffee b/assets/scripts/app/helpers/handlebars.coffee
index 9d0ceb39..98901e6a 100644
--- a/assets/scripts/app/helpers/handlebars.coffee
+++ b/assets/scripts/app/helpers/handlebars.coffee
@@ -48,6 +48,7 @@ Ember.Handlebars.registerHelper('label', (options) ->
     options.hash.for = id
     options.hashTypes.for = 'STRING'
     options.hashContexts.for = this
+    options.fn = Ember.Handlebars.compile("{{view.content}}")
 
   Ember.Handlebars.helpers.view.call(this, view, options)
 )
diff --git a/assets/scripts/app/templates/ssh_key/_form.hbs b/assets/scripts/app/templates/ssh_key/_form.hbs
index 0e35e09d..2e15f1f3 100644
--- a/assets/scripts/app/templates/ssh_key/_form.hbs
+++ b/assets/scripts/app/templates/ssh_key/_form.hbs
@@ -1,10 +1,10 @@
 <form class="ssh-key" {{action "save" on="submit"}}>
   <div class="field">
-    <label>Description:</label>
+    {{label for="description" content="Description:"}}
     {{input value=description}}
   </div>
   {{#travis-field "value"}}
-    <label class="value">Private Key:</label>
+    {{label for="value" class="value" content="Private key:"}}
     {{textarea value=value}} {{travis-errors "value"}}
   {{/travis-field}}