diff --git a/app/components/add-ssh-key.coffee b/app/components/add-ssh-key.coffee
new file mode 100644
index 00000000..3de91684
--- /dev/null
+++ b/app/components/add-ssh-key.coffee
@@ -0,0 +1,8 @@
+`import Ember from 'ember'`
+
+AddSshKeyComponent = Ember.Component.extend
+
+  classNames: ['form--sshkey']
+
+
+`export default AddSshKeyComponent`
diff --git a/app/templates/components/add-ssh-key.hbs b/app/templates/components/add-ssh-key.hbs
new file mode 100644
index 00000000..1f44a246
--- /dev/null
+++ b/app/templates/components/add-ssh-key.hbs
@@ -0,0 +1,11 @@
+<form action="">
+  <div class="form-elem">
+    <input type="text" placeholder="Description">
+  </div>
+  <div class="form-elem">
+    <textarea name="" id="" cols="30" rows="10" placeholder="SSH key"></textarea>
+  </div>
+  <div class="form-elem">
+    <input type="submit" class="form-submit" value="Add">
+  </div>
+</form>
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index 04745a97..4fd90540 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -35,19 +35,7 @@
       {{ssh-key key=model.customSshKey}}
     {{else}}
       {{ssh-key key=model.sshKey}}
-      <div class="form--sshkey">
-        <form action="">
-          <div class="form-elem">
-            <input type="text" placeholder="Description">
-          </div>
-          <div class="form-elem">
-            <textarea name="" id="" cols="30" rows="10" placeholder="SSH key"></textarea>
-          </div>
-          <div class="form-elem">
-            <input type="submit" class="form-submit" value="Add">
-          </div>
-        </form>
-      </div>
+      {{add-ssh-key }}
     {{/if}}
 
     
@@ -60,8 +48,3 @@
   </section>
 
 </div>
-
-
-{{!-- <div id="settings">
-  {{outlet}}
-</div> --}}