diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp
index e8dd040e5..31b54da76 100644
--- a/src/timerd/timermanager.cpp
+++ b/src/timerd/timermanager.cpp
@@ -355,7 +355,6 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi
 		{
 			case CTimerd::TIMER_SHUTDOWN:
 			case CTimerd::TIMER_NEXTPROGRAM:
-			case CTimerd::TIMER_ZAPTO:
 			case CTimerd::TIMER_STANDBY:
 			case CTimerd::TIMER_REMIND:
 			case CTimerd::TIMER_SLEEPTIMER:
@@ -368,6 +367,11 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi
 				(static_cast<CTimerEvent_Record*>(event))->getEpgId();
 				break;
 			}
+			case CTimerd::TIMER_ZAPTO:
+			{
+				(static_cast<CTimerEvent_Zapto*>(event))->getEpgId(); 
+				break;
+			}
 			default:
 				break;
 		}
@@ -970,8 +974,9 @@ void CTimerEvent::printEvent(void)
 		case CTimerd::TIMER_ZAPTO :
 			dprintf(" Zapto: "
 				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
-				" epg: %llx\n",
+				" epg: %s (%llx)\n",
 				static_cast<CTimerEvent_Zapto*>(this)->eventInfo.channel_id,
+				static_cast<CTimerEvent_Zapto*>(this)->epgTitle.c_str(),
 				static_cast<CTimerEvent_Zapto*>(this)->eventInfo.epgID);
 			break;
 
@@ -1296,6 +1301,12 @@ void CTimerEvent_Zapto::getEpgId()
 			break;
 		}
 	}
+	if(eventInfo.epgID != 0)
+	{
+		CShortEPGData epgdata;
+		if (sdc.getEPGidShort(eventInfo.epgID, &epgdata))
+			epgTitle=epgdata.title; 
+	}
 }
 //=============================================================
 // NextProgram Event
diff --git a/src/timerd/timermanager.h b/src/timerd/timermanager.h
index 1b465ebc4..6fc29e661 100644
--- a/src/timerd/timermanager.h
+++ b/src/timerd/timermanager.h
@@ -132,7 +132,7 @@ class CTimerEvent_Record : public CTimerEvent
 	virtual void stopEvent();
 	virtual void saveToConfig(CConfigFile *config);
 	virtual void Reschedule();
-	void getEpgId();
+	virtual void getEpgId();
 	virtual void Refresh();
 };
 
@@ -154,7 +154,7 @@ class CTimerEvent_Zapto : public CTimerEvent_Record
 	virtual void fireEvent();
 	virtual void announceEvent();
 	virtual void stopEvent(){};
-	void getEpgId();
+	virtual void getEpgId();
 };
 
 class CTimerEvent_NextProgram : public CTimerEvent