diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index ab13f6ad..53f92375 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -286,6 +286,9 @@ export default {
       } else {
         start_datetime = moment(this.date).set('hour', start_hour).set('minute', start_minute)
         end_datetime = moment(this.date).set('hour', end_hour).set('minute', end_minute)
+        if (end_hour<start_hour) {
+          end_datetime = end_datetime.add(1, 'day')
+        }
       }
       const formData = new FormData()
 
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 029f05a0..e43c714f 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -76,6 +76,7 @@ const userController = {
 
     const eventDetails = {
       title: body.title,
+      // remove html tag
       description: body.description ? body.description.replace(/(<([^>]+)>)/ig, '') : '',
       multidate: body.multidate,
       start_datetime: body.start_datetime,