diff --git a/lib/main.dart b/lib/main.dart
index 1277346..d14e769 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -34,23 +34,21 @@ class MyApp extends StatelessWidget {
     Widget viewToDisplay = const SignUpView();
 
     // Skip sign-up + fill provider if user already connected
-    if (!kIsWeb) {
-      if (localDB.hasUser()) {
-        final User user = localDB.getUser();
-        final userActivities = localDB.getAllActivities();
+    if (!kIsWeb && localDB.hasUser()) {
+      final User user = localDB.getUser();
+      final userActivities = localDB.getAllActivities();
 
-        context.watch<User>().username = user.username;
-        context.watch<User>().email = user.email;
-        context.watch<User>().token = user.token;
-        context.watch<User>().listActivity = userActivities;
+      context.watch<User>().username = user.username;
+      context.watch<User>().email = user.email;
+      context.watch<User>().token = user.token;
+      context.watch<User>().listActivity = userActivities;
 
-        stdout.write("===== USER =====\n");
-        stdout.write("Username: ${user.username}\n");
-        stdout.write("Email: ${user.email}\n");
-        stdout.write("Token: ${user.token}\n");
+      stdout.write("===== USER =====\n");
+      stdout.write("Username: ${user.username}\n");
+      stdout.write("Email: ${user.email}\n");
+      stdout.write("Token: ${user.token}\n");
 
-        viewToDisplay = const MainTabView();
-      }
+      viewToDisplay = const MainTabView();
     }
 
     return MaterialApp(
diff --git a/lib/modele/local_db/objectbox.dart b/lib/modele/local_db/objectbox.dart
index 8245880..3029be3 100644
--- a/lib/modele/local_db/objectbox.dart
+++ b/lib/modele/local_db/objectbox.dart
@@ -45,7 +45,6 @@ class ObjectBox implements DbImpl {
   @override
   User getUser() {
     db.User userRes = userBox.get(1);
-
     return User.create(userRes.username, userRes.email, userRes.token);
   }
 
@@ -83,8 +82,7 @@ class ObjectBox implements DbImpl {
   // ===== Activity =====
   @override
   void addActivity(String uuid, String filename, String category, String info) {
-    db.Activity act =
-        db.Activity(0, uuid, filename, category, jsonEncode(info));
+    db.Activity act = db.Activity(0, uuid, filename, category, info);
 
     try {
       activityBox.put(act);
@@ -125,6 +123,7 @@ class ObjectBox implements DbImpl {
 
     for (db.Activity act in activityDBList) {
       ActivityInfo actInfo = ActivityInfo.fromJson(jsonDecode(act.info));
+
       userActivityList
           .add(ActivityOfUser(actInfo, act.category, act.uuid, act.filename));
     }
diff --git a/lib/modele/local_db/request_local.dart b/lib/modele/local_db/request_local.dart
index b10bd5f..a8fcb26 100644
--- a/lib/modele/local_db/request_local.dart
+++ b/lib/modele/local_db/request_local.dart
@@ -41,7 +41,7 @@ class RequestLocal implements IDataStrategy {
       jsonList.add(json);
     }
 
-    return Tuple2(true, jsonEncode(activities));
+    return Tuple2(true, jsonList);
   }
 
   @override
diff --git a/lib/modele/user.dart b/lib/modele/user.dart
index 79f68e4..c0126ce 100644
--- a/lib/modele/user.dart
+++ b/lib/modele/user.dart
@@ -11,7 +11,7 @@ class User extends ChangeNotifier {
 
   User();
 
-  User.create(String username, String email, String token);
+  User.create(this.username, this.email, this.token);
 
   void addActivity(ActivityOfUser activity) {
     listActivity.add(activity);
diff --git a/lib/modele/utile/list_activity/list_activity_utile.dart b/lib/modele/utile/list_activity/list_activity_utile.dart
index 4b06c67..dd79aa0 100644
--- a/lib/modele/utile/list_activity/list_activity_utile.dart
+++ b/lib/modele/utile/list_activity/list_activity_utile.dart
@@ -74,9 +74,10 @@ class ListActivityUtile {
           element["filename"].toString()));
 
       // Save to local db
-      if (!kIsWeb)
+      if (!kIsWeb) {
         localDB.addActivity(element["uuid"], element["filename"],
             element["category"], jsonEncode(element["info"]));
+      }
     }
     return const Tuple2(true, "Yeah");
   }