2 files changed, 25 insertions, 5 deletions
diff --git a/pyload/web/app/scripts/views/headerView.js b/pyload/web/app/scripts/views/headerView.js
index b4ffbc35d..e6e763b26 100644
--- a/pyload/web/app/scripts/views/headerView.js
+++ b/pyload/web/app/scripts/views/headerView.js
@@ -7,6 +7,10 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle
         // Renders the header with all information
         return Backbone.Marionette.ItemView.extend({
 
+            modelEvents: {
+                'change': 'render'
+            },
+
             events: {
                 'click .icon-list': 'toggle_taskList',
                 'click .popover .close': 'toggle_taskList',
@@ -42,6 +46,8 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle
                 var self = this;
                 this.notificationView = new NotificationView();
 
+                this.model = App.user;
+
                 this.status = new ServerStatus();
                 this.listenTo(this.status, 'change', this.update);
 
diff --git a/pyload/web/app/scripts/views/loginView.js b/pyload/web/app/scripts/views/loginView.js
index 891b3ec99..9c96f625b 100644
--- a/pyload/web/app/scripts/views/loginView.js
+++ b/pyload/web/app/scripts/views/loginView.js
@@ -17,20 +17,34 @@ define(['jquery', 'backbone', 'underscore', 'app', 'hbs!tpl/login'],
             login: function(e) {
                 e.stopPropagation();
 
+                var self = this;
                 var options = App.apiRequest('login', null, {
                     data: this.ui.form.serialize(),
-                    type : 'post',
+                    type: 'post',
                     success: function(data) {
-                        // TODO: go to last page, better error
-                        if (data)
+                        console.log('User logged in', data);
+                        // TODO: go to last page
+                        if (data) {
+                            App.user.set(data);
+                            App.user.save();
                             App.navigate('');
-                        else
-                            alert('Wrong login');
+                        }
+                        else {
+                            self.wrongLogin();
+                        }
+                    },
+                    error: function() {
+                        self.wrongLogin();
                     }
                 });
 
                 $.ajax(options);
                 return false;
+            },
+
+            // TODO: improve
+            wrongLogin: function() {
+                alert('Wrong login');
             }
 
         });