diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart
index 0361a6e2..6c72fbb9 100644
--- a/lib/controllers/providers/api/service_requests_provider.dart
+++ b/lib/controllers/providers/api/service_requests_provider.dart
@@ -141,26 +141,26 @@ class ServiceRequestsProvider extends ChangeNotifier {
       "requestedTime": DateTime.now().toIso8601String(),
       "client": user.hospital?.id ?? '',
       "callComments": serviceRequest.maintenanceIssue,
-      "attachmentsCallRequest": serviceRequest.devicePhotos.map((e) => {"name": e}).toList(),
+      if (serviceRequest.devicePhotos.isNotEmpty) "attachmentsCallRequest": serviceRequest.devicePhotos.map((e) => {"name": e}).toList(),
       "priority": serviceRequest.priority.toMap(),
       "defectType": serviceRequest.defectType.toMap(),
       "typeofRequest": serviceRequest.type.toMap(),
       "requestedThrough": serviceRequest.type.toMap(),
       "reviewComment": serviceRequest.comment,
-      "voiceNote": serviceRequest.audio,
-      "noofFollowup": 0,
+      if (serviceRequest.audio != null) "voiceNote": serviceRequest.audio,
       "callSiteContactPerson": [
         {
           "id": 0,
-          "employeeCode": "string",
-          "name": "",
-          "telephone": "",
-          "job": "",
-          "email": "",
-          "land": "",
-          "contactUserId": "66e4235d-2527-471d-bbef-f29625fde43d ",
+          "employeeCode": user.email,
+          "name": user.userName,
+          "telephone": user.phoneNumber,
+          // "job": "",
+          "email": user.email,
+          // "land": "",
+          "contactUserId": user.id,
         },
       ],
+      "noofFollowup": 0,
       "status": null,
       "callLastSituation": null,
       "firstAction": null,
diff --git a/lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart
index 42524743..695a4075 100644
--- a/lib/views/pages/user/requests/create_request.dart
+++ b/lib/views/pages/user/requests/create_request.dart
@@ -235,8 +235,12 @@ class _CreateRequestPageState extends State<CreateRequestPage> {
                         text: _subtitle.submit,
                         onPressed: () async {
                           if (!_formKey.currentState.validate()) return;
+                          if (_device?.id == null) {
+                            Fluttertoast.showToast(msg: _subtitle.pickDevice);
+                            return;
+                          }
                           _formKey.currentState.save();
-                          _serviceRequest.deviceId = _device?.id ?? "";
+                          _serviceRequest.deviceId = _device?.id;
                           _isLoading = true;
                           setState(() {});
                           _serviceRequest.devicePhotos = _deviceImages.map((e) => "${e.path.split("/").last}|${base64Encode(e.readAsBytesSync())}").toList();