diff --git a/app/pods/login/login-form/component.js b/app/pods/login/login-form/component.js
new file mode 100644
index 0000000..56a0f99
--- /dev/null
+++ b/app/pods/login/login-form/component.js
@@ -0,0 +1,22 @@
+import Ember from 'ember';
+
+const { Component } = Ember;
+
+export default Component.extend({
+  // Actions
+  "on-save": null,
+  "on-cancel": null,
+  "on-update": null,
+  "add-characteristic": null,
+  "save-measurement": null,
+  "delete-measurement": null,
+
+  // Property mapping
+  propertiesList: ['identification', 'password'],
+  identification: null,
+  password: null,
+
+  updateField: function(property, value) {
+    this.set(property, value);
+  },
+});
diff --git a/app/pods/login/login-form/template.hbs b/app/pods/login/login-form/template.hbs
new file mode 100644
index 0000000..8492f1c
--- /dev/null
+++ b/app/pods/login/login-form/template.hbs
@@ -0,0 +1,10 @@
+<form {{action "authenticate" on="submit"}}>
+  <h2>Log In</h2>
+    {{input value=identification type="text" placeholder="Email"}}
+    {{input value=password type="password" placeholder="Password"}}
+    {{input class="button-gray" type="submit" value="Log In"}}
+</form>
+<br>
+<div>
+  {{link-to 'Forget your password?' 'users.requestlockouthelp'}}
+</div>
diff --git a/app/pods/login/route.js b/app/pods/login/route.js
index c38d19e..a9687fd 100644
--- a/app/pods/login/route.js
+++ b/app/pods/login/route.js
@@ -1,4 +1,6 @@
 import Ember from 'ember';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
 
-export default Ember.Route.extend(UnauthenticatedRouteMixin, {});
+const { Route } = Ember;
+
+export default Route.extend(UnauthenticatedRouteMixin, {});
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
index 246c876..6a6fec6 100644
--- a/app/pods/login/template.hbs
+++ b/app/pods/login/template.hbs
@@ -1,12 +1,3 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  <form {{action "authenticate" on="submit"}}>
-    <h2>Log In</h2>
-      {{input value=identification type="text" placeholder="Email"}}
-      {{input value=password type="password" placeholder="Password"}}
-      {{input class="button-gray" type="submit" value="Log In"}}
-  </form>
-  <br>
-  <div>
-    {{link-to 'Forget your password?' 'users.requestlockouthelp'}}
-  </div>
+  {{login/login-form}}
 {{/x-application}}