diff --git a/SeniorAssistant/Controllers/AccountController.cs b/SeniorAssistant/Controllers/AccountController.cs
index 9edde56..34366d7 100644
--- a/SeniorAssistant/Controllers/AccountController.cs
+++ b/SeniorAssistant/Controllers/AccountController.cs
@@ -45,9 +45,11 @@ namespace IdentityDemo.Controllers
         [HttpPost]
         public ActionResult _login(string username, string password)
         {
-            JsonResponse response = new JsonResponse();
-            response.Success = false;
-            response.Message = "Username or password is invalid.";
+            JsonResponse response = new JsonResponse
+            {
+                Success = false,
+                Message = "Username or password is invalid."
+            };
 
             var strunz = Db.GetTable<User>().Where(user => user.Username.Equals(username) && user.Password.Equals(password)).ToListAsync().Result;
 
diff --git a/SeniorAssistant/Controllers/HomeController.cs b/SeniorAssistant/Controllers/HomeController.cs
index 4ee48c6..10faf56 100644
--- a/SeniorAssistant/Controllers/HomeController.cs
+++ b/SeniorAssistant/Controllers/HomeController.cs
@@ -47,6 +47,8 @@ namespace SeniorAssistant.Controllers
         [Route("User/{User}")]
         public IActionResult SingleUser(string user)
         {
+            if(session.GetString("username") == null)
+                return RedirectToAction("Index");
             return View("data", user);
         }
     }
diff --git a/SeniorAssistant/Models/Heartbeat.cs b/SeniorAssistant/Models/Heartbeat.cs
index baf0622..7bcfd6d 100644
--- a/SeniorAssistant/Models/Heartbeat.cs
+++ b/SeniorAssistant/Models/Heartbeat.cs
@@ -7,7 +7,6 @@ namespace SeniorAssistant.Models
     {
         [PrimaryKey]
         [NotNull]
-        [Association(ThisKey = nameof(Username), OtherKey = nameof(User.Username), CanBeNull = false)]
         public string Username { get; set; }
 
         [PrimaryKey]
@@ -15,5 +14,10 @@ namespace SeniorAssistant.Models
         public DateTime Time { get; set; }
 
         public double Value { get; set; }
+
+        /*
+        [Association(ThisKey = nameof(Username), OtherKey = nameof(User.Username), CanBeNull = false)]
+        public User UserObj { get; set; }
+        */
     }
 }
diff --git a/SeniorAssistant/Models/Sleep.cs b/SeniorAssistant/Models/Sleep.cs
index 12ba7f9..b542d99 100644
--- a/SeniorAssistant/Models/Sleep.cs
+++ b/SeniorAssistant/Models/Sleep.cs
@@ -7,7 +7,6 @@ namespace SeniorAssistant.Models
     {
         [PrimaryKey]
         [NotNull]
-        [Association(ThisKey = nameof(Username), OtherKey = nameof(User.Username), CanBeNull = false)]
         public string Username { get; set; }
 
         [PrimaryKey]
diff --git a/SeniorAssistant/Models/Step.cs b/SeniorAssistant/Models/Step.cs
index 04eeab6..3385092 100644
--- a/SeniorAssistant/Models/Step.cs
+++ b/SeniorAssistant/Models/Step.cs
@@ -7,7 +7,6 @@ namespace SeniorAssistant.Models
     {
         [PrimaryKey]
         [NotNull]
-        [Association(ThisKey = nameof(Username), OtherKey = nameof(User.Username), CanBeNull = false)]
         public string Username { get; set; }
 
         [PrimaryKey]
diff --git a/SeniorAssistant/Models/User.cs b/SeniorAssistant/Models/User.cs
index dd9e25c..4f12d0b 100644
--- a/SeniorAssistant/Models/User.cs
+++ b/SeniorAssistant/Models/User.cs
@@ -1,18 +1,19 @@
 using LinqToDB.Mapping;
 using Microsoft.AspNetCore.Identity;
+using Newtonsoft.Json;
 
 namespace SeniorAssistant.Models
 {
     public class User : IHasUsername
     {
-        [PrimaryKey]
-        [NotNull]
+        [Column(IsPrimaryKey = true, CanBeNull = false)]
         public string Username { get; set; }
 
         [NotNull]
         public string Email { get; set; }
 
         [NotNull]
+        [JsonIgnore]
         public string Password { get; set; }
 
         [NotNull]
diff --git a/SeniorAssistant/Startup.cs b/SeniorAssistant/Startup.cs
index 3d652ee..b2e605a 100644
--- a/SeniorAssistant/Startup.cs
+++ b/SeniorAssistant/Startup.cs
@@ -121,7 +121,7 @@ namespace SeniorAssistant
             using (var db = dataContext.Create())
             {
                 const string baseUsername = "vecchio";
-                string[] users = { "Mario", "Giovanni", "Aldo", "Giacomo", "Marcello", "Filippo" };
+                string[] names = { "Mario", "Giovanni", "Aldo", "Giacomo", "Marcello", "Filippo" };
                     
                 db.CreateTableIfNotExists<Heartbeat>();
                 db.CreateTableIfNotExists<Sleep>();
@@ -130,7 +130,7 @@ namespace SeniorAssistant
                 {
                     db.CreateTable<User>();
                     int count = 0;
-                    foreach (string user in users)
+                    foreach (string user in names)
                     {
                         var username = baseUsername + count;
                         db.InsertOrReplace(new User { Name = user, Username = username, Password = username, Email = username + "@email.st" } );
@@ -145,7 +145,7 @@ namespace SeniorAssistant
                 now = now.AddHours(DateTime.Now.Hour).AddMinutes(30);
                 try
                 {
-                    double totalHours = 50;
+                    double totalHours = 48;
                     try {
                         DateTime maxTimeInDB = db.GetTable<Heartbeat>().MaxAsync(x => x.Time).Result;
                         TimeSpan span = now.Subtract(maxTimeInDB);
@@ -155,21 +155,17 @@ namespace SeniorAssistant
                     for (int i = 0; i<totalHours; i++)
                     {
                         DateTime time = now.AddHours(-i);
-                        for (int num = 0; num < users.Length; num++)
+                        for (int num = 0; num < names.Length; num++)
                         {
                             string user = baseUsername + num;
 
-                            if (time.Day != now.Day)
+                            if (time.Day != now.Day && time.Hour == 21)
                             {
                                 db.Insert(new Sleep() { Username = user, Time = time, Value = rnd.Next(5 * 3600000, 9 * 3600000) });
                             }
                             db.Insert(new Heartbeat() { Username = user, Time = time, Value = rnd.Next(50, 120) });
                             db.Insert(new Step() { Username = user, Time = time, Value = rnd.Next(100, 500) });
                         }
-                        if (time.Day != now.Day)
-                        {
-                            now = now.AddDays(-1);
-                        }
                     }
                 }
                 catch { }
diff --git a/SeniorAssistant/senior.db b/SeniorAssistant/senior.db
index 743a37e..5b101e4 100644
Binary files a/SeniorAssistant/senior.db and b/SeniorAssistant/senior.db differ