diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index c202ed1e19..459ee9413a 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -518,6 +518,11 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 				{
 					row.set_disabled(true);
 				}
+				// Highlight current user, sort_key is account_id
+				if(sort_key === egw.user('account_id'))
+				{
+					row.set_class('current_user')
+				}
 				// Since the daywise cache is by user, we can tap in here
 				var t = new Date(this.options.start_date);
 				var end = new Date(this.options.end_date);
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index a1406d124a..d4dc1b9326 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1113,6 +1113,9 @@ Hide subsequent headers in week view with non-consolidated owners
     top: 2px;
 }
 
+.calendar_plannerRowWidget.current_user {
+	background-color: rgba(0,0,0,0.05);
+}
 .calendar_plannerRowWidget:hover {
 	background-color: rgba(103, 159, 210, 0.2);
 }
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 9fbbc1549e..13d281fbd7 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1079,6 +1079,9 @@ Hide subsequent headers in week view with non-consolidated owners
   left: 10px;
   top: 2px;
 }
+.calendar_plannerRowWidget.current_user {
+  background-color: rgba(0, 0, 0, 0.05);
+}
 .calendar_plannerRowWidget:hover {
   background-color: rgba(103, 159, 210, 0.2);
 }