diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
index 8469d71f70..cb32dc4d3e 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events-admin.html
@@ -48,13 +48,13 @@
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="dateFrom">Date (From)</label>
                             <div class="col-sm-4">
-                                <input class="form-control" type="date" id="dateFrom" name="dateFrom" data-ng-model="query.dateFrom">
+                                <input class="form-control" type="text" id="dateFrom" name="dateFrom" data-ng-model="query.dateFrom"  placeholder="yyyy-MM-dd">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="dateTo">Date (To)</label>
                             <div class="col-sm-4">
-                                <input class="form-control" type="date" id="dateTo" name="dateTo" data-ng-model="query.dateTo">
+                                <input class="form-control" type="text" id="dateTo" name="dateTo" data-ng-model="query.dateTo"  placeholder="yyyy-MM-dd">
                             </div>
                         </div>
 
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
index 8df1629d68..2540603894 100755
--- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
+++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/realm-events.html
@@ -52,13 +52,13 @@
                     <div class="form-group" data-ng-show="filter">
                         <label class="col-md-2 control-label" for="dateFrom">Date (From)</label>
                         <div class="col-md-6">
-                            <input class="form-control" type="date" id="dateFrom" name="dateFrom" data-ng-model="query.dateFrom">
+                            <input class="form-control" type="text" id="dateFrom" name="dateFrom" data-ng-model="query.dateFrom" placeholder="yyyy-MM-dd">
                         </div>
                     </div>
                     <div class="form-group" data-ng-show="filter">
                         <label class="col-md-2 control-label" for="dateTo">Date (To)</label>
                         <div class="col-md-6">
-                            <input class="form-control" type="date" id="dateTo" name="dateTo" data-ng-model="query.dateTo">
+                            <input class="form-control" type="text" id="dateTo" name="dateTo" data-ng-model="query.dateTo" placeholder="yyyy-MM-dd">
                         </div>
                     </div>
 
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
index 666537bc6e..b27ce49430 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java
@@ -392,7 +392,7 @@ public class RealmAdminResource {
             try {
                 from = df.parse(dateFrom);
             } catch (ParseException e) {
-                throw new BadRequestException("Invalid value for 'Date(From)', excepted format is yyyy-MM-dd");
+                throw new BadRequestException("Invalid value for 'Date(From)', expected format is yyyy-MM-dd");
             }
             query.fromDate(from);
         }
@@ -403,7 +403,7 @@ public class RealmAdminResource {
             try {
                 to = df.parse(dateTo);
             } catch (ParseException e) {
-                throw new BadRequestException("Invalid value for 'Date(To)', excepted format is yyyy-MM-dd");
+                throw new BadRequestException("Invalid value for 'Date(To)', expected format is yyyy-MM-dd");
             }
             query.toDate(to);
         }
@@ -485,18 +485,18 @@ public class RealmAdminResource {
             try {
                 from = df.parse(dateFrom);
             } catch (ParseException e) {
-                throw new BadRequestException("Invalid value for 'Date(From)', excepted format is yyyy-MM-dd");
+                throw new BadRequestException("Invalid value for 'Date(From)', expected format is yyyy-MM-dd");
             }
             query.fromTime(from);
         }
         
         if(dateTo != null) {
-            SimpleDateFormat df = new SimpleDateFormat("Invalid value for 'Date(To)', excepted format is yyyy-MM-dd");
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             Date to = null;
             try {
                 to = df.parse(dateTo);
             } catch (ParseException e) {
-                throw new BadRequestException("An unexpected server error has occurred");
+                throw new BadRequestException("Invalid value for 'Date(To)', expected format is yyyy-MM-dd");
             }
             query.toTime(to);
         }