diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index ec1077b..910a88a 100644
--- a/app/pods/login/controller.js
+++ b/app/pods/login/controller.js
@@ -1,14 +1,15 @@
 import Ember from 'ember';
 
-export default Ember.Controller.extend({
-  session: Ember.inject.service('session'),
+const { Controller, inject: { service } } = Ember;
+
+export default Controller.extend({
+  session: service(),
 
   actions: {
-    authenticate: function() {
+    authenticate: function(identification, password) {
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
 
-      let { identification, password } = this.getProperties('identification', 'password');
       this.transitionToRoute('loading').then(() => {
         this.get('session').authenticate('authenticator:oauth2', identification, password).catch((error) => {
           this.transitionToRoute('login').then(() => {
diff --git a/app/pods/login/login-form/component.js b/app/pods/login/login-form/component.js
index 56a0f99..22e2cff 100644
--- a/app/pods/login/login-form/component.js
+++ b/app/pods/login/login-form/component.js
@@ -4,19 +4,16 @@ 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,
+  "on-submit": null,
 
   // Property mapping
   propertiesList: ['identification', 'password'],
   identification: null,
   password: null,
 
-  updateField: function(property, value) {
-    this.set(property, value);
+  actions: {
+    submit: function() {
+      return this.attrs['on-submit'](this.get('identification'), this.get('password'));
+    },
   },
 });
diff --git a/app/pods/login/login-form/template.hbs b/app/pods/login/login-form/template.hbs
index 8492f1c..65f5adb 100644
--- a/app/pods/login/login-form/template.hbs
+++ b/app/pods/login/login-form/template.hbs
@@ -1,4 +1,4 @@
-<form {{action "authenticate" on="submit"}}>
+<form {{action "submit" on="submit"}}>
   <h2>Log In</h2>
     {{input value=identification type="text" placeholder="Email"}}
     {{input value=password type="password" placeholder="Password"}}
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
index 6a6fec6..870b977 100644
--- a/app/pods/login/template.hbs
+++ b/app/pods/login/template.hbs
@@ -1,3 +1,6 @@
 {{#x-application invalidateSession="invalidateSession"}}
-  {{login/login-form}}
+  {{
+    login/login-form
+    on-submit=(action "authenticate")
+  }}
 {{/x-application}}