diff --git a/fooder/controller/user_settings.py b/fooder/controller/user_settings.py
index cff3c1e..ded7e11 100644
--- a/fooder/controller/user_settings.py
+++ b/fooder/controller/user_settings.py
@@ -1,6 +1,7 @@
 from fooder.controller.base import ModelController
 from fooder.domain import UserSettings
 from fooder.model.user_settings import UserSettingsUpdateModel
+from fooder.utils.calories import calculate_calories
 
 
 class UserSettingsController(ModelController[UserSettings]):
@@ -15,5 +16,12 @@ class UserSettingsController(ModelController[UserSettings]):
             self.obj.fiber_goal = data.fiber_goal
         if data.calories_goal is not None:
             self.obj.calories_goal = data.calories_goal
+        else:
+            self.obj.calories_goal = calculate_calories(
+                protein=self.obj.protein_goal,
+                carb=self.obj.carb_goal,
+                fat=self.obj.fat_goal,
+                fiber=self.obj.fiber_goal,
+            )
 
         await self.ctx.repo.user_settings.update(self.obj)
diff --git a/fooder/utils/datetime.py b/fooder/utils/datetime.py
index fa26346..dd8289f 100644
--- a/fooder/utils/datetime.py
+++ b/fooder/utils/datetime.py
@@ -2,4 +2,4 @@ from datetime import datetime, timezone
 
 
 def utc_now() -> datetime:
-    return datetime.now(timezone.utc)
+    return datetime.now(timezone.utc).replace(tzinfo=None)