diff --git a/Back/skydiveLogs-api.Business/ImageService.cs b/Back/skydiveLogs-api.Business/ImageService.cs
index 4b2848a..7ff4073 100644
--- a/Back/skydiveLogs-api.Business/ImageService.cs
+++ b/Back/skydiveLogs-api.Business/ImageService.cs
@@ -31,9 +31,9 @@ namespace skydiveLogs_api.Business
             return _imageRepository.GetById(id);
         }
 
-        public IEnumerable<Image> GetAllImages()
+        public IEnumerable<Image> GetAllImages(User connectedUser)
         {
-            return _imageRepository.GetAll();
+            return _imageRepository.GetAll(connectedUser);
         }
 
         public void UpdateImage(int id, Image Image)
diff --git a/Back/skydiveLogs-api.Business/Interface/IImageService.cs b/Back/skydiveLogs-api.Business/Interface/IImageService.cs
index e87ceb1..716e335 100644
--- a/Back/skydiveLogs-api.Business/Interface/IImageService.cs
+++ b/Back/skydiveLogs-api.Business/Interface/IImageService.cs
@@ -7,7 +7,7 @@ namespace skydiveLogs_api.Business.Interface
 {
     public interface IImageService
     {
-        IEnumerable<Image> GetAllImages();
+        IEnumerable<Image> GetAllImages(User connectedUser);
 
         Image GetImageById(int id);
 
diff --git a/Back/skydiveLogs-api.Business/StatsService.cs b/Back/skydiveLogs-api.Business/StatsService.cs
index f55acfb..d1ca193 100644
--- a/Back/skydiveLogs-api.Business/StatsService.cs
+++ b/Back/skydiveLogs-api.Business/StatsService.cs
@@ -18,159 +18,219 @@ namespace skydiveLogs_api.Business
         public IEnumerable<Statistic> GetStatsByAircraft(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            return allJumps.GroupBy(j => j.Aircraft.Name,
-                                    j => j,
-                                    (groupby, jumps) => new Statistic
-                                    {
-                                        Label = groupby.ToString(),
-                                        Nb = jumps.Count()
-                                    })
-                            .ToList();
+            if (allJumps.Any())
+            {
+                results = allJumps.GroupBy(j => j.Aircraft.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsByDz(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            return allJumps.GroupBy(j => j.DropZone.Name,
-                                    j => j,
-                                    (groupby, jumps) => new Statistic
-                                    {
-                                        Label = groupby.ToString(),
-                                        Nb = jumps.Count()
-                                    })
-                            .ToList();
+            if (allJumps.Any())
+            {
+                results = allJumps.GroupBy(j => j.DropZone.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsByJumpType(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            return allJumps.GroupBy(j => j.JumpType.Name,
-                                    j => j,
-                                    (groupby, jumps) => new Statistic
-                                    {
-                                        Label = groupby.ToString(),
-                                        Nb = jumps.Count()
-                                    })
-                            .ToList();
+            if (allJumps.Any())
+            {
+                results = allJumps.GroupBy(j => j.JumpType.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsByGear(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            return allJumps.GroupBy(j => j.Gear.Name,
-                                    j => j,
-                                    (groupby, jumps) => new Statistic
-                                    {
-                                        Label = groupby.ToString(),
-                                        Nb = jumps.Count()
-                                    })
-                            .ToList();
+            if (allJumps.Any())
+            {
+                results = allJumps.GroupBy(j => j.Gear.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsByYear(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            return allJumps.GroupBy(j => j.JumpDate.Year,
-                                    j => j,
-                                    (groupby, jumps) => new Statistic
-                                    {
-                                        Label = groupby.ToString(),
-                                        Nb = jumps.Count()
-                                    })
-                            .ToList();
+            if (allJumps.Any())
+            {
+                results = allJumps.GroupBy(j => j.JumpDate.Year,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsForLastYearByDz(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault();
-            var yearOfLastJump = lastJump.JumpDate.Year;
+            if (allJumps.Any())
+            {
+                var lastJump = allJumps.OrderByDescending(j => j.JumpDate).First();
+                var yearOfLastJump = lastJump.JumpDate.Year;
 
-            return allJumps.Where(j => j.JumpDate.Year == yearOfLastJump)
-                           .GroupBy(j => j.DropZone.Name,
-                                   j => j,
-                                   (groupby, jumps) => new Statistic
-                                   {
-                                       Label = groupby.ToString(),
-                                       Nb = jumps.Count()
-                                   })
-                           .ToList();
+                results = allJumps.Where(j => j.JumpDate.Year == yearOfLastJump)
+                                  .GroupBy(j => j.DropZone.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsForLastYearByJumpType(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault();
-            var yearOfLastJump = lastJump.JumpDate.Year;
+            if (allJumps.Any())
+            {
+                var lastJump = allJumps.OrderByDescending(j => j.JumpDate).First();
+                var yearOfLastJump = lastJump.JumpDate.Year;
 
-            return allJumps.Where(j => j.JumpDate.Year == yearOfLastJump)
-                           .GroupBy(j => j.JumpType.Name,
-                                   j => j,
-                                   (groupby, jumps) => new Statistic
-                                   {
-                                       Label = groupby.ToString(),
-                                       Nb = jumps.Count()
-                                   })
-                           .ToList();
+                results = allJumps.Where(j => j.JumpDate.Year == yearOfLastJump)
+                                  .GroupBy(j => j.JumpType.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsForLastMonthByDz(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault();
-            var yearOfLastJump = lastJump.JumpDate.Year;
-            var monthOfLastJump = lastJump.JumpDate.Month;
+            if (allJumps.Any())
+            {
+                var lastJump = allJumps.OrderByDescending(j => j.JumpDate).First();
+                var yearOfLastJump = lastJump.JumpDate.Year;
+                var monthOfLastJump = lastJump.JumpDate.Month;
 
-            return allJumps.Where(j => j.JumpDate.Year == yearOfLastJump && j.JumpDate.Month == monthOfLastJump)
-                           .GroupBy(j => j.DropZone.Name,
-                                   j => j,
-                                   (groupby, jumps) => new Statistic
-                                   {
-                                       Label = groupby.ToString(),
-                                       Nb = jumps.Count()
-                                   })
-                           .ToList();
+                results = allJumps.Where(j => j.JumpDate.Year == yearOfLastJump && j.JumpDate.Month == monthOfLastJump)
+                                  .GroupBy(j => j.DropZone.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public IEnumerable<Statistic> GetStatsForLastMonthByJumpType(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new List<Statistic>();
 
-            var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault();
-            var yearOfLastJump = lastJump.JumpDate.Year;
-            var monthOfLastJump = lastJump.JumpDate.Month;
+            if (allJumps.Any())
+            {
+                var lastJump = allJumps.OrderByDescending(j => j.JumpDate).First();
+                var yearOfLastJump = lastJump.JumpDate.Year;
+                var monthOfLastJump = lastJump.JumpDate.Month;
 
-            return allJumps.Where(j => j.JumpDate.Year == yearOfLastJump && j.JumpDate.Month == monthOfLastJump)
-                           .GroupBy(j => j.JumpType.Name,
-                                   j => j,
-                                   (groupby, jumps) => new Statistic
-                                   {
-                                       Label = groupby.ToString(),
-                                       Nb = jumps.Count()
-                                   })
-                           .ToList();
+                results = allJumps.Where(j => j.JumpDate.Year == yearOfLastJump && j.JumpDate.Month == monthOfLastJump)
+                                  .GroupBy(j => j.JumpType.Name,
+                                           j => j,
+                                           (groupby, jumps) => new Statistic
+                                           {
+                                               Label = groupby.ToString(),
+                                               Nb = jumps.Count()
+                                           })
+                                  .ToList();
+            }
+
+            return results;
         }
 
         public SimpleSummary GetSimpleSummary(User connectedUser)
         {
             var allJumps = _jumpService.GetAllJumps(connectedUser);
+            var results = new SimpleSummary();
 
-            var lastJump = allJumps.OrderByDescending(j => j.JumpDate).FirstOrDefault();
-
-            return new SimpleSummary
+            if (allJumps.Any())
             {
-                LastJump = lastJump,
-                TotalJumps = allJumps.Count(),
-                TotalCutaways = allJumps.Where(j => j.WithCutaway).Count()
-            };
+                var lastJump = allJumps.OrderByDescending(j => j.JumpDate).First();
+
+                results = new SimpleSummary
+                {
+                    LastJump = lastJump,
+                    TotalJumps = allJumps.Count(),
+                    TotalCutaways = allJumps.Where(j => j.WithCutaway).Count()
+                };
+            }
+
+            return results;
         }
 
         private readonly IJumpService _jumpService;
diff --git a/Back/skydiveLogs-api/Controllers/ImageController.cs b/Back/skydiveLogs-api/Controllers/ImageController.cs
index 9d9ba94..df33e59 100644
--- a/Back/skydiveLogs-api/Controllers/ImageController.cs
+++ b/Back/skydiveLogs-api/Controllers/ImageController.cs
@@ -25,7 +25,7 @@ namespace skydiveLogs_api.Controllers
         [EnableCors]
         public IEnumerable<ImageResp> Get()
         {
-            var result = _imageService.GetAllImages();
+            var result = _imageService.GetAllImages(ConnectedUser);
             return _mapper.Map<IEnumerable<ImageResp>>(result);
         }