diff --git a/client/src/views/admin/field-manager/fields/foreign/field.js b/client/src/views/admin/field-manager/fields/foreign/field.js
index bb3d481b64..de264a0f02 100644
--- a/client/src/views/admin/field-manager/fields/foreign/field.js
+++ b/client/src/views/admin/field-manager/fields/foreign/field.js
@@ -30,7 +30,7 @@ Espo.define('views/admin/field-manager/fields/foreign/field', 'views/fields/enum
 
     return Dep.extend({
 
-        typeList: ['varchar', 'enum', 'enumInt', 'enumFloat', 'int', 'float', 'website'],
+        typeList: ['varchar', 'enum', 'enumInt', 'enumFloat', 'int', 'float', 'website', 'date', 'datetime'],
 
         setup: function () {
             Dep.prototype.setup.call(this);
@@ -112,6 +112,10 @@ Espo.define('views/admin/field-manager/fields/foreign/field', 'views/fields/enum
                 this.viewValue = 'views/fields/foreign-int';
             } else if (type == 'float') {
                 this.viewValue = 'views/fields/foreign-float';
+            } else if (type == 'date') {
+                this.viewValue = 'views/fields/foreign-date';
+            } else if (type == 'datetime') {
+                this.viewValue = 'views/fields/foreign-datetime';
             } else {
                 this.viewValue = null;
             }
diff --git a/client/src/views/fields/foreign-date.js b/client/src/views/fields/foreign-date.js
new file mode 100644
index 0000000000..d319fc235f
--- /dev/null
+++ b/client/src/views/fields/foreign-date.js
@@ -0,0 +1,37 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('views/fields/foreign-date', 'views/fields/date', function (Dep) {
+
+    return Dep.extend({
+
+        type: 'foreign'
+
+    });
+});
+
diff --git a/client/src/views/fields/foreign-datetime.js b/client/src/views/fields/foreign-datetime.js
new file mode 100644
index 0000000000..c00b2897ea
--- /dev/null
+++ b/client/src/views/fields/foreign-datetime.js
@@ -0,0 +1,37 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2017 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+Espo.define('views/fields/foreign-datetime', 'views/fields/datetime', function (Dep) {
+
+    return Dep.extend({
+
+        type: 'foreign'
+
+    });
+});
+