diff --git a/app/api/views.py b/app/api/views.py
index 88fb311..9b2d676 100644
--- a/app/api/views.py
+++ b/app/api/views.py
@@ -189,6 +189,7 @@ def post(self, request, *args, **kwargs):
                             time_measured=station_data['time'],
                             time_received=time_received,
                             room = station.current_room,
+                            user = station.current_user,
                         )
                         measurement.save()
 
diff --git a/app/main/util.py b/app/main/util.py
index 008178a..ce44d7f 100644
--- a/app/main/util.py
+++ b/app/main/util.py
@@ -3,7 +3,7 @@
 
 from devices.models import Device, DeviceStatus
 
-def get_or_create_station(station_info: dict): 
+def get_or_create_station(station_info: dict):
     '''
     station_info dict: 
     {
@@ -28,11 +28,9 @@ def get_or_create_station(station_info: dict):
     )
     if created:
         station.device_name = station_info['device']
-        station.firmware = station_info['firmware']
-        station.last_update = datetime.datetime.now(datetime.timezone.utc)
-        station.api_key = station_info['apikey']
         station.model = station_info['model']
         station.firmware = station_info['firmware']
+        station.api_key = station_info['apikey']
     
     # add a new DeviceStatus
     station_status = DeviceStatus.objects.create(