diff --git a/app/pods/application/loading/template.hbs b/app/pods/application/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/application/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index fed3485..496efda 100644
--- a/app/pods/login/controller.js
+++ b/app/pods/login/controller.js
@@ -11,6 +11,7 @@ export default Ember.Controller.extend({
       this.get('flashMessages').clearMessages();
       this.transitionToRoute('loading').then(() => {
         session.authenticate(authenticator, credentials).then(null, (error)=> {
+          this.transitionToRoute('login');
           this.get('flashMessages').error(error.error);
         });
       });