diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js
index f96694335c6b001a81c38b49548e57f38f13394f..613ea215438b592e7220f90c338b7ecd80c4fc06 100644
--- a/layouts/v7/modules/Calendar/resources/Calendar.js
+++ b/layouts/v7/modules/Calendar/resources/Calendar.js
@@ -242,7 +242,8 @@ Vtiger.Class("Calendar_Calendar_Js", {
 		}
 	},
 	getFeedRequestParams: function (start, end, feedCheckbox) {
-		var dateFormat = 'YYYY-MM-DD';
+		var userFormat = jQuery('body').data('userDateformat').toUpperCase();
+		var dateFormat = userFormat;
 		var startDate = start.format(dateFormat);
 		var endDate = end.format(dateFormat);
 		return {
diff --git a/layouts/v7/modules/Calendar/resources/SharedCalendar.js b/layouts/v7/modules/Calendar/resources/SharedCalendar.js
index 126cc3446f6e25b6cd76c64c9b8a4a0faa20d0c8..d93195e5f5f29ef76459cd3abd75ebee8604760b 100644
--- a/layouts/v7/modules/Calendar/resources/SharedCalendar.js
+++ b/layouts/v7/modules/Calendar/resources/SharedCalendar.js
@@ -12,7 +12,8 @@ Calendar_Calendar_Js('Calendar_SharedCalendar_Js', {
 	},
 
 	getFeedRequestParams : function(start,end,feedCheckbox) {
-		var dateFormat = 'YYYY-MM-DD';
+		var userFormat = jQuery('body').data('userDateformat').toUpperCase();
+		var dateFormat = userFormat;
 		var startDate = start.format(dateFormat);
 		var endDate = end.format(dateFormat);
 		return {
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index 88d923c55f2321f20257f094ae6fc1a1c20cca15..6849ccbf57da2464fe60580ecd1101fa527673c1 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/SaveRecord.php b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/SaveRecord.php
index 2e9bf19a36dfbb878c6872145a9fe17f77c38374..266fb17d4ee0479c7587e1ef5822ab62569a99c4 100644
--- a/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/SaveRecord.php
+++ b/pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/apis/SaveRecord.php
@@ -20,12 +20,16 @@ class CustomerPortal_SaveRecord extends CustomerPortal_FetchRecord {
 
 	function process(CustomerPortal_API_Request $request) {
 		$response = new CustomerPortal_API_Response();
-		global $current_user;
+		global $current_user, $adb;
 		$current_user = $this->getActiveUser();
 
 		if ($current_user) {
 			$module = $request->get('module');
 
+                        $recordId = $request->get('recordId');
+                        if($recordId){
+                            $module = VtigerWebserviceObject::fromId($adb, $recordId)->getEntityName();
+                        }
 			if (!CustomerPortal_Utils::isModuleActive($module)) {
 				throw new Exception("Module not accessible", 1412);
 				exit;