diff --git a/frappe/__version__.py b/frappe/__version__.py
index b37c4e5e1a..31fff91197 100644
--- a/frappe/__version__.py
+++ b/frappe/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "5.0.22"
+__version__ = "5.0.23"
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index d32226fca5..c993dce046 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -55,8 +55,6 @@ class FormMeta(Meta):
 		return d
 
 	def add_code(self):
-		if self.custom:
-			return
 		path = os.path.join(get_module_path(self.module), 'doctype', scrub(self.name))
 		def _get_path(fname):
 			return os.path.join(path, scrub(fname))
@@ -81,6 +79,8 @@ class FormMeta(Meta):
 			self.set(fieldname, (self.get(fieldname) or "") + "\n\n" + render_include(js))
 
 	def add_html_templates(self, path):
+		if self.custom:
+			return
 		js = ""
 		for fname in os.listdir(path):
 			if fname.endswith(".html"):
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 09cf4feb39..8e2217aa70 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -4,7 +4,7 @@ app_title = "Frappe Framework"
 app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.0.22"
+app_version = "5.0.23"
 app_color = "orange"
 
 app_email = "support@frappe.io"
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index cfbde0d5cd..99b43915f1 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -394,6 +394,10 @@ ul.linked-with-list li {
 .modal-title {
   margin-top: 5px;
 }
+.modal .form-control {
+  position: relative;
+  z-index: 1140;
+}
 .form-group {
   margin-bottom: 7px;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index b7c9897cbb..80c211b3bf 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -224,6 +224,13 @@ ul.linked-with-list li {
 	margin-top: 5px;
 }
 
+// fixes datepicker z-index issue
+// datepicker takes zindex of input + 1 when input's position is relative
+.modal .form-control {
+	position: relative;
+	z-index: 1140;
+}
+
 .form-group {
 	margin-bottom: 7px;
 }
diff --git a/setup.py b/setup.py
index c9ac4e3415..1ca235b445 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.0.22"
+version = "5.0.23"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()