@@ -151,9 +151,9 @@ def submit_link():

 @bone_blueprint.route('', methods=['GET'])

 @login_required

 def default_data():

-    result = '', 401, {}

-    if 'username' in session:

-        result = data(current_user.id)

+    print current_user.id

+    print 'username' in session

+    result = data(current_user.id)

     return result

 @bone_blueprint.route('/u/<username>', methods=['GET'])

@@ -111,6 +111,7 @@ def adduser():

                 session['username'] = username

                 result['status'] = True

                 _get_users()

+                login_user(User.get_user(username))

             except psycopg2.IntegrityError as e:

                 db.rollback()

                 if e.pgcode == '23505': #username not unique

@@ -24,7 +24,7 @@ marrowApp.config(['$routeProvider',

         responseError: function(rejection) {

             if (rejection.status === 401) {

                 console.log("Response Error 401",rejection);

-                $window.location.href = '/login.html#' + encodeURIComponent($location.path());

+                $window.location.href = '/login.html';

             }

             return $q.reject(rejection);

         }

@@ -1,5 +1,6 @@

 window.URL = window.URL || window.webkitURL;

-var loginModule = angular.module('marrowLogin', ['ngResource','ngRoute','angulartics', 'angulartics.google.analytics']);

+var loginModule = angular.module('marrowLogin', ['ngResource','ngRoute','angulartics',

+                                 'angulartics.google.analytics', 'angulartics.piwik']);

 loginModule.controller('LoginCtrl', function ($scope,$http,$route,$window) {

   $scope.message = '';

@@ -14,10 +15,10 @@ loginModule.controller('LoginCtrl', function ($scope,$http,$route,$window) {

     });

   };

-  check_login().success(

-    function(is_loggedon) {

-      if (is_loggedon.result) { $window.location.href = '/';}

-  });

+  //check_login().success(

+  //  function(is_loggedon) {

+  //    if (is_loggedon.result) { $window.location.href = '/';}

+  //});

   $scope.newuser = function () {

     var username = $scope.username;